a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 01:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Script fix

Browse source
This commit is contained in:
eray orçunus 2019-10-31 02:00:04 +03:00
parent 30c780c300
commit 5bb217fcb6
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/control/Script.cpp
View file

@ -4676,7 +4676,7 @@ int8 CRunningScript::ProcessCommandsFrom500To599(int32 command)
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed; CPlayerPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
assert(pPed); assert(pPed);
pPed->m_fHealth = *(float*)&ScriptParams[1]; pPed->m_fHealth = ScriptParams[1];
return 0; return 0;
} }
case COMMAND_SET_CHAR_HEALTH: case COMMAND_SET_CHAR_HEALTH:
@ -4684,9 +4684,8 @@ int8 CRunningScript::ProcessCommandsFrom500To599(int32 command)
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]); CPed* pPed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
assert(pPed); assert(pPed);
float health = *(float*)&ScriptParams[1]; if (ScriptParams[1]) {
if (health != 0.0f) { pPed->m_fHealth = ScriptParams[1];
pPed->m_fHealth = *(float*)&ScriptParams[1];
} }
else if (pPed->bInVehicle) { else if (pPed->bInVehicle) {
pPed->SetDead(); pPed->SetDead();
@ -4703,7 +4702,7 @@ int8 CRunningScript::ProcessCommandsFrom500To599(int32 command)
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
assert(pVehicle); assert(pVehicle);
pVehicle->m_fHealth = *(float*)&ScriptParams[1]; pVehicle->m_fHealth = ScriptParams[1];
return 0; return 0;
} }
case COMMAND_GET_PLAYER_HEALTH: case COMMAND_GET_PLAYER_HEALTH:
@ -4839,7 +4838,7 @@ int8 CRunningScript::ProcessCommandsFrom500To599(int32 command)
CPed* pSourcePed = CPools::GetPedPool()->GetAt(ScriptParams[0]); CPed* pSourcePed = CPools::GetPedPool()->GetAt(ScriptParams[0]);
assert(pSourcePed); assert(pSourcePed);
pSourcePed->ClearLookFlag(); pSourcePed->ClearLookFlag();
pSourcePed->bIsRestoringLook = false; pSourcePed->bKeepTryingToLook = false;
if (pSourcePed->GetPedState() == PED_LOOK_HEADING || pSourcePed->GetPedState() == PED_LOOK_ENTITY) if (pSourcePed->GetPedState() == PED_LOOK_HEADING || pSourcePed->GetPedState() == PED_LOOK_ENTITY)
pSourcePed->RestorePreviousState(); pSourcePed->RestorePreviousState();
return 0; return 0;
@ -4850,7 +4849,7 @@ int8 CRunningScript::ProcessCommandsFrom500To599(int32 command)
CPed* pSourcePed = CWorld::Players[ScriptParams[0]].m_pPed; CPed* pSourcePed = CWorld::Players[ScriptParams[0]].m_pPed;
assert(pSourcePed); assert(pSourcePed);
pSourcePed->ClearLookFlag(); pSourcePed->ClearLookFlag();
pSourcePed->bIsRestoringLook = false; pSourcePed->bKeepTryingToLook = false;
if (pSourcePed->GetPedState() == PED_LOOK_HEADING || pSourcePed->GetPedState() == PED_LOOK_ENTITY) if (pSourcePed->GetPedState() == PED_LOOK_HEADING || pSourcePed->GetPedState() == PED_LOOK_ENTITY)
pSourcePed->RestorePreviousState(); pSourcePed->RestorePreviousState();
return 0; return 0;