mirror of
https://github.com/GTAmodding/re3.git
synced 2021-02-19 17:49:54 +01:00
fix
This commit is contained in:
parent
13b52229be
commit
6a93cc49be
@ -66,7 +66,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
|
|||||||
return 0;
|
return 0;
|
||||||
case COMMAND_WANTED_STARS_ARE_FLASHING:
|
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);
|
UpdateCompareFlag(pWanted->m_nMinWantedLevel - pWanted->m_nWantedLevel > 0);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -136,7 +136,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
|
|||||||
CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
|
CTheScripts::ReadTextLabelFromScript(&m_nIp, key);
|
||||||
m_nIp += KEY_LENGTH_IN_SCRIPT;
|
m_nIp += KEY_LENGTH_IN_SCRIPT;
|
||||||
CVector pos = pPlayerInfo->GetPos();
|
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
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -352,7 +352,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
|
|||||||
case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI:
|
case COMMAND_CREATE_DUST_EFFECT_FOR_CUTSCENE_HELI:
|
||||||
{
|
{
|
||||||
CollectParameters(&m_nIp, 3);
|
CollectParameters(&m_nIp, 3);
|
||||||
CObject *pHeli = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
|
CObject* pHeli = CPools::GetObjectPool()->GetAt(ScriptParams[0]);
|
||||||
bool found = false;
|
bool found = false;
|
||||||
float waterLevel = -1000.0f;
|
float waterLevel = -1000.0f;
|
||||||
CVector pos = pHeli->GetPosition();
|
CVector pos = pHeli->GetPosition();
|
||||||
@ -396,11 +396,13 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
|
|||||||
return 0;
|
return 0;
|
||||||
#elif (!defined GTA_PS2)
|
#elif (!defined GTA_PS2)
|
||||||
case COMMAND_SET_ONSCREEN_COUNTER_FLASH_WHEN_FIRST_DISPLAYED:
|
case COMMAND_SET_ONSCREEN_COUNTER_FLASH_WHEN_FIRST_DISPLAYED:
|
||||||
|
{
|
||||||
script_assert(CTheScripts::ScriptSpace[m_nIp++] == ARGUMENT_GLOBALVAR);
|
script_assert(CTheScripts::ScriptSpace[m_nIp++] == ARGUMENT_GLOBALVAR);
|
||||||
uint16 var = CTheScripts::Read2BytesFromScript(&m_nIp);
|
uint16 var = CTheScripts::Read2BytesFromScript(&m_nIp);
|
||||||
CollectParameters(&m_nIp, 1);
|
CollectParameters(&m_nIp, 1);
|
||||||
//CUserDisplay::OnscnTimer.SetCounterFlashWhenFirstDisplayed(var, ScriptParams[0]);
|
//CUserDisplay::OnscnTimer.SetCounterFlashWhenFirstDisplayed(var, ScriptParams[0]);
|
||||||
break;
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#if (defined GTA_PC && !defined GTAVC_JP_PATCH || defined GTA_XBOX || defined SUPPORT_XBOX_SCRIPT || defined GTA_MOBILE || defined SUPPORT_MOBILE_SCRIPT)
|
#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:
|
case COMMAND_SHUFFLE_CARD_DECKS:
|
||||||
|
Loading…
Reference in New Issue
Block a user