archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-26 00:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aap/lcs' into lcs

Browse Source 
# Conflicts:
#	src/vehicles/Vehicle.cpp
#	src/vehicles/Vehicle.h
This commit is contained in:
Sergeanur
2021-08-12 11:45:25 +03:00
parent 9a1b826021 621f941ff7
commit ec22576e49
8 changed files with 218 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/rw/VisibilityPlugins.cpp
View File

@ -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?

6
src/rw/VisibilityPlugins.h
View File

@ -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