diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-30 12:48:01 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-02 14:13:09 +0200 |
| commit | d23b2c423e5811cf6e9de28cbf8490de32ea4fb5 (patch) | |
| tree | 0240b530a05679dc6d629c414f59bf56588a93b2 /src/control/Script.cpp | |
| parent | Merge pull request #502 from rollschuh2282/patch-1 (diff) | |
| download | re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.gz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.bz2 re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.lz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.xz re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.tar.zst re3-d23b2c423e5811cf6e9de28cbf8490de32ea4fb5.zip | |
Diffstat (limited to 'src/control/Script.cpp')
| -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; |