summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-08 21:37:47 +0200
committeraap <aap@papnet.eu>2019-07-08 21:37:47 +0200
commit2ae112fdf6b90bb4435dba34bcc2a23604e1e158 (patch)
tree5137e9ee1d2b01cd1a125409f1cb23a92a142d9f /src/modelinfo
parentlittle changes; one more function of CAutomobile (diff)
downloadre3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar.gz
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar.bz2
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar.lz
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar.xz
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.tar.zst
re3-2ae112fdf6b90bb4435dba34bcc2a23604e1e158.zip
Diffstat (limited to '')
-rw-r--r--src/modelinfo/VehicleModelInfo.cpp8
-rw-r--r--src/modelinfo/VehicleModelInfo.h2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index 810ed042..9b2924e9 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -414,11 +414,13 @@ CVehicleModelInfo::SetAtomicFlagCB(RwObject *object, void *data)
return object;
}
-RpAtomic*
-CVehicleModelInfo::ClearAtomicFlagCB(RpAtomic *atomic, void *data)
+RwObject*
+CVehicleModelInfo::ClearAtomicFlagCB(RwObject *object, void *data)
{
+ RpAtomic *atomic = (RpAtomic*)object;
+ assert(RwObjectGetType(object) == rpATOMIC);
CVisibilityPlugins::ClearAtomicFlag(atomic, (int)data);
- return atomic;
+ return object;
}
RwObject*
diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h
index f66bc21f..37f47489 100644
--- a/src/modelinfo/VehicleModelInfo.h
+++ b/src/modelinfo/VehicleModelInfo.h
@@ -107,7 +107,7 @@ public:
void SetAtomicRenderCallbacks(void);
static RwObject *SetAtomicFlagCB(RwObject *object, void *data);
- static RpAtomic *ClearAtomicFlagCB(RpAtomic *atomic, void *data);
+ static RwObject *ClearAtomicFlagCB(RwObject *atomic, void *data);
void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
void PreprocessHierarchy(void);
void GetWheelPosn(int32 n, CVector &pos);