diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-26 22:03:15 +0300 |
| commit | f0890b11122291a22d6a65f349281cf1aed49bd0 (patch) | |
| tree | 3b418b522c5fd097abac916693e59808ea4f5b4f /src/render/Fluff.h | |
| parent | 3e460d94acd6e08301b0be2d4de58fe8f65aff57 (diff) | |
| parent | 4dc2f307910c6d5dcf3c910b3da2e2d943ac1003 (diff) | |
Merge branch 'master' into MoreLanguages
# Conflicts:
# src/core/Frontend.cpp
# src/core/MenuScreens.h
# src/render/Font.cpp
# src/render/Font.h
# src/text/Messages.cpp
# src/text/Text.cpp
Diffstat (limited to 'src/render/Fluff.h')
| -rw-r--r-- | src/render/Fluff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/Fluff.h b/src/render/Fluff.h index 7ab2d81d..fe3ab256 100644 --- a/src/render/Fluff.h +++ b/src/render/Fluff.h @@ -8,7 +8,7 @@ public: CMovingThing *m_pNext; CMovingThing *m_pPrev; int16 m_nType; - int16 field_A; + int16 m_nHidden; CVector m_vecPosn; CEntity* m_pEntity; |