diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-19 15:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 15:54:05 +0200 |
| commit | f9ed50e17813d2a6708a6516e18041c7482a7462 (patch) | |
| tree | e8d1312d1e2a9706793ac781271fedc73db91624 /src/control | |
| parent | Fix savename buffer overflow (diff) | |
| parent | Struct cleanup, various fixes, enable PS2 rand (diff) | |
| download | re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.gz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.bz2 re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.lz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.xz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.zst re3-f9ed50e17813d2a6708a6516e18041c7482a7462.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Pickups.cpp | 8 | ||||
| -rw-r--r-- | src/control/Script.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 9836c9c2..f9605ca6 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -99,7 +99,7 @@ CPickup::GiveUsAPickUpObject(int32 handle) switch (m_eType) { case PICKUP_IN_SHOP: - object->m_obj_flag2 = true; + object->bPickupObjWithMessage = true; object->bOutOfStock = false; break; case PICKUP_ON_STREET: @@ -113,11 +113,11 @@ CPickup::GiveUsAPickUpObject(int32 handle) case PICKUP_NAUTICAL_MINE_ARMED: case PICKUP_FLOATINGPACKAGE: case PICKUP_ON_STREET_SLOW: - object->m_obj_flag2 = false; + object->bPickupObjWithMessage = false; object->bOutOfStock = false; break; case PICKUP_IN_SHOP_OUT_OF_STOCK: - object->m_obj_flag2 = false; + object->bPickupObjWithMessage = false; object->bOutOfStock = true; object->bRenderScorched = true; break; @@ -690,7 +690,7 @@ CPickups::DoPickUpEffects(CEntity *entity) size, 65.0f, CCoronas::TYPE_RING, CCoronas::FLARE_NONE, CCoronas::REFLECTION_OFF, CCoronas::LOSCHECK_OFF, CCoronas::STREAK_OFF, 0.0f); CObject *object = (CObject*)entity; - if (object->m_obj_flag2 || object->bOutOfStock || object->m_nBonusValue) { + if (object->bPickupObjWithMessage || object->bOutOfStock || object->m_nBonusValue) { float dist = (TheCamera.GetPosition() - pos).Magnitude(); const float MAXDIST = 12.0f; diff --git a/src/control/Script.cpp b/src/control/Script.cpp index f1cc8ede..bfe2de34 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -8931,7 +8931,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]); assert(pPed); if (ScriptParams[1]) - pPed->m_nZoneLevel = -1; + pPed->m_nZoneLevel = LEVEL_IGNORE; else pPed->m_nZoneLevel = CTheZones::GetLevelFromPosition(pPed->GetPosition()); return 0; @@ -9130,7 +9130,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command) CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); assert(pVehicle); if (ScriptParams[1]) - pVehicle->m_nZoneLevel = -1; + pVehicle->m_nZoneLevel = LEVEL_IGNORE; else pVehicle->m_nZoneLevel = CTheZones::GetLevelFromPosition(pVehicle->GetPosition()); return 0; |