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

sync with upstream

Browse Source
This commit is contained in:
Nikolay Korolev
2019-07-09 23:39:29 +03:00
parent 11ae1b06ae a65dd41da7
commit ca4c7d9a4b
38 changed files with 1065 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/modelinfo/VehicleModelInfo.cpp
View File

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

2
src/modelinfo/VehicleModelInfo.h
View File

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