diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-02 17:02:45 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-02 17:02:45 +0200 |
commit | 7d067684ff4c69ecaf911ca23b478087f5655437 (patch) | |
tree | a47fbbaf7937616d80e799f3a9157d933c1f69c0 /src/control/Script.cpp | |
parent | changed saving compatibility (diff) | |
parent | A bit more audio cleanup (diff) | |
download | re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar.gz re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar.bz2 re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar.lz re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar.xz re3-7d067684ff4c69ecaf911ca23b478087f5655437.tar.zst re3-7d067684ff4c69ecaf911ca23b478087f5655437.zip |
Diffstat (limited to '')
-rw-r--r-- | src/control/Script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 4b3ed3bd..b63a5d87 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1293,7 +1293,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command) if (pos.z <= MAP_Z_LOW_LIMIT) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); pos.z += CWorld::Players[index].m_pPed->GetDistanceFromCentreOfMassToBaseOfModel(); - CWorld::Players[index].m_pPed->GetPosition() = pos; + CWorld::Players[index].m_pPed->SetPosition(pos); CTheScripts::ClearSpaceForMissionEntity(pos, CWorld::Players[index].m_pPed); CPlayerPed::ReactivatePlayerPed(index); ScriptParams[0] = index; @@ -5153,7 +5153,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command) if (pos.z <= MAP_Z_LOW_LIMIT) pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); CRestart::OverrideNextRestart(pos, *(float*)&ScriptParams[3]); - if (CWorld::Players[CWorld::PlayerInFocus].m_WBState != WBSTATE_PLAYING) //TODO: enum + if (CWorld::Players[CWorld::PlayerInFocus].m_WBState != WBSTATE_PLAYING) printf("RESTART_CRITICAL_MISSION - Player state is not PLAYING\n"); CWorld::Players[CWorld::PlayerInFocus].PlayerFailedCriticalMission(); return 0; |