diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-09 22:39:29 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-07-09 22:39:29 +0200 |
commit | ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1 (patch) | |
tree | 22019f7aa3ed57061c581ae837b6f4f3751d3822 /src/modelinfo | |
parent | RunningScript: 1/12 (diff) | |
parent | yet more CAutomobile (diff) | |
download | re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.gz re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.bz2 re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.lz re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.xz re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.zst re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.zip |
Diffstat (limited to 'src/modelinfo')
-rw-r--r-- | src/modelinfo/VehicleModelInfo.cpp | 8 | ||||
-rw-r--r-- | src/modelinfo/VehicleModelInfo.h | 2 |
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); |