diff options
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/GameLogic.cpp | 12 | ||||
| -rw-r--r-- | src/control/Pickups.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp index 0ed5d5cf..ccba05c9 100644 --- a/src/control/GameLogic.cpp +++ b/src/control/GameLogic.cpp @@ -112,8 +112,8 @@ CGameLogic::Update() CCarCtrl::ClearInterestingVehicleList();
CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
CRestart::FindClosestHospitalRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
- CRestart::OverrideHospitalLevel = false;
- CRestart::OverridePoliceStationLevel = false;
+ CRestart::OverrideHospitalLevel = LEVEL_NONE;
+ CRestart::OverridePoliceStationLevel = LEVEL_NONE;
PassTime(720);
RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
SortOutStreamingAndMemory(pPlayerInfo.GetPos());
@@ -183,8 +183,8 @@ CGameLogic::Update() CCarCtrl::ClearInterestingVehicleList();
CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
- CRestart::OverrideHospitalLevel = false;
- CRestart::OverridePoliceStationLevel = false;
+ CRestart::OverrideHospitalLevel = LEVEL_NONE;
+ CRestart::OverridePoliceStationLevel = LEVEL_NONE;
PassTime(720);
RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
pPlayerInfo.m_pPed->ClearWeapons();
@@ -224,8 +224,8 @@ CGameLogic::Update() CCarCtrl::ClearInterestingVehicleList();
CWorld::ClearExcitingStuffFromArea(pPlayerInfo.GetPos(), 4000.0f, 1);
CRestart::FindClosestPoliceRestartPoint(pPlayerInfo.GetPos(), &vecRestartPos, &fRestartFloat);
- CRestart::OverridePoliceStationLevel = false;
- CRestart::OverrideHospitalLevel = false;
+ CRestart::OverridePoliceStationLevel = LEVEL_NONE;
+ CRestart::OverrideHospitalLevel = LEVEL_NONE;
RestorePlayerStuffDuringResurrection(pPlayerInfo.m_pPed, vecRestartPos, fRestartFloat);
SortOutStreamingAndMemory(pPlayerInfo.GetPos());
TheCamera.m_fCamShakeForce = 0.0f;
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp index 91fd889c..52861e99 100644 --- a/src/control/Pickups.cpp +++ b/src/control/Pickups.cpp @@ -660,7 +660,7 @@ CPickups::DoPickUpEffects(CEntity *entity) if (!entity->m_flagD80) {
float s = Sin((float)((CTimer::GetTimeInMilliseconds() + (uintptr)entity) & 0x7FF) * DEGTORAD(360.0f / 0x800));
- float modifiedSin = 0.3 * (s + 1.0f);
+ float modifiedSin = 0.3f * (s + 1.0f);
int16 colorId;
|