diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-13 22:15:45 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-01-13 22:15:45 +0100 |
| commit | 6a93cc49be79a397bb1549813ba2001fbbab120f (patch) | |
| tree | 4cb575ffb7021d39386a4364e58c508047175554 /src/control | |
| parent | hud ammo fix (diff) | |
| download | re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar.gz re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar.bz2 re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar.lz re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar.xz re3-6a93cc49be79a397bb1549813ba2001fbbab120f.tar.zst re3-6a93cc49be79a397bb1549813ba2001fbbab120f.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Script8.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp index 74552b23..c34830e7 100644 --- a/src/control/Script8.cpp +++ b/src/control/Script8.cpp @@ -66,7 +66,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) return 0; case COMMAND_WANTED_STARS_ARE_FLASHING: { - CWanted *pWanted = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted; + CWanted* pWanted = CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted; UpdateCompareFlag(pWanted->m_nMinWantedLevel - pWanted->m_nWantedLevel > 0); return 0; } @@ -136,7 +136,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) CTheScripts::ReadTextLabelFromScript(&m_nIp, key); m_nIp += KEY_LENGTH_IN_SCRIPT; CVector pos = pPlayerInfo->GetPos(); - CZone *infoZone = CTheZones::FindInformationZoneForPosition(&pos); + CZone* infoZone = CTheZones::FindInformationZoneForPosition(&pos); UpdateCompareFlag(strncmp(key, infoZone->name, 8) == 0); // original code doesn't seem to be using strncmp in here and compare 2 ints instead return 0; } @@ -352,7 +352,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI: { CollectParameters(&m_nIp, 3); - CObject *pHeli = CPools::GetObjectPool()->GetAt(ScriptParams[0]); + CObject* pHeli = CPools::GetObjectPool()->GetAt(ScriptParams[0]); bool found = false; float waterLevel = -1000.0f; CVector pos = pHeli->GetPosition(); @@ -396,11 +396,13 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) return 0; #elif (!defined GTA_PS2) case COMMAND_SET_ONSCREEN_COUNTER_FLASH_WHEN_FIRST_DISPLAYED: + { script_assert(CTheScripts::ScriptSpace[m_nIp++] == ARGUMENT_GLOBALVAR); uint16 var = CTheScripts::Read2BytesFromScript(&m_nIp); CollectParameters(&m_nIp, 1); //CUserDisplay::OnscnTimer.SetCounterFlashWhenFirstDisplayed(var, ScriptParams[0]); - break; + return 0; + } #endif #if (defined GTA_PC && !defined GTAVC_JP_PATCH || defined GTA_XBOX || defined SUPPORT_XBOX_SCRIPT || defined GTA_MOBILE || defined SUPPORT_MOBILE_SCRIPT) case COMMAND_SHUFFLE_CARD_DECKS: |