diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:19:21 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-13 00:27:15 +0300 |
| commit | 33dfaf7da11675fdad2909e39b6d15e49fc6cc68 (patch) | |
| tree | ff2b3fe079b51b521cb26ceb2da0a5717b0601ff /src/modelinfo | |
| parent | dc444b9ca06efd32eb624e5da063cfec309a086a (diff) | |
| parent | c40fcdf39ab77cb0fde26e314652e0aaf9dd4544 (diff) | |
Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
# premake5.lua
# src/core/ZoneCull.cpp
# src/core/Zones.cpp
# src/objects/CutsceneHead.cpp
# src/render/Clouds.cpp
Diffstat (limited to 'src/modelinfo')
| -rw-r--r-- | src/modelinfo/VehicleModelInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index a10073e4..d80fc4cf 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -293,7 +293,7 @@ CVehicleModelInfo::HideDamagedAtomicCB(RpAtomic *atomic, void *data) RpAtomic* CVehicleModelInfo::HideAllComponentsAtomicCB(RpAtomic *atomic, void *data) { - if(CVisibilityPlugins::GetAtomicId(atomic) & (int)data) + if(CVisibilityPlugins::GetAtomicId(atomic) & (uintptr)data) RpAtomicSetFlags(atomic, 0); else RpAtomicSetFlags(atomic, rpATOMICRENDER); @@ -484,7 +484,7 @@ CVehicleModelInfo::SetAtomicFlagCB(RwObject *object, void *data) { RpAtomic *atomic = (RpAtomic*)object; assert(RwObjectGetType(object) == rpATOMIC); - CVisibilityPlugins::SetAtomicFlag(atomic, (int)data); + CVisibilityPlugins::SetAtomicFlag(atomic, (uintptr)data); return object; } @@ -493,7 +493,7 @@ CVehicleModelInfo::ClearAtomicFlagCB(RwObject *object, void *data) { RpAtomic *atomic = (RpAtomic*)object; assert(RwObjectGetType(object) == rpATOMIC); - CVisibilityPlugins::ClearAtomicFlag(atomic, (int)data); + CVisibilityPlugins::ClearAtomicFlag(atomic, (uintptr)data); return object; } |