summaryrefslogtreecommitdiffstats
path: root/src/rw
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2021-08-12 10:45:25 +0200
committerSergeanur <s.anureev@yandex.ua>2021-08-12 10:45:25 +0200
commitec22576e49cbf1128c61e2bbeae44c07b26e0b8b (patch)
tree9a700c4901bea931a5d1f87f588294ca3c6ebefd /src/rw
parentMerge remote-tracking branch 'origin/miami' into lcs (diff)
parentCVehicle done (diff)
downloadre3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar.gz
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar.bz2
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar.lz
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar.xz
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.tar.zst
re3-ec22576e49cbf1128c61e2bbeae44c07b26e0b8b.zip
Diffstat (limited to 'src/rw')
-rw-r--r--src/rw/VisibilityPlugins.cpp1
-rw-r--r--src/rw/VisibilityPlugins.h6
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 6f36ac53..c84c7d8b 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -902,6 +902,7 @@ void*
CVisibilityPlugins::AtomicConstructor(void *object, int32, int32)
{
ATOMICEXT(object)->modelId = -1;
+ ATOMICEXT(object)->flags = 0;
#ifdef VIS_DISTANCE_ALPHA
// This seems strange, want to start out invisible before fading in
// but maybe it's set elsewhere?
diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h
index 0f7048cd..e8ff0735 100644
--- a/src/rw/VisibilityPlugins.h
+++ b/src/rw/VisibilityPlugins.h
@@ -100,10 +100,8 @@ public:
struct AtomicExt
{
- union {
- int16 modelId; // used by SimpleModelInfo
- int flags; // used by ClumpModelInfo
- };
+ int16 modelId; // used by SimpleModelInfo
+ uint16 flags; // used by ClumpModelInfo
#ifdef VIS_DISTANCE_ALPHA
int distanceAlpha;
#endif