diff options
| author | Nikolay <nickvnuk@gmail.com> | 2021-08-31 22:16:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 22:16:52 +0200 |
| commit | 9bd80324d1ff3f221304a7dde98358d9895926c2 (patch) | |
| tree | 7f2b08583a71f159faa69b4254b54e4fac55174c /src/control/Script5.cpp | |
| parent | Bridge sound done (diff) | |
| parent | fix compile (diff) | |
| download | re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.gz re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.bz2 re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.lz re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.xz re3-9bd80324d1ff3f221304a7dde98358d9895926c2.tar.zst re3-9bd80324d1ff3f221304a7dde98358d9895926c2.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/control/Script5.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp index 75e33e36..45952497 100644 --- a/src/control/Script5.cpp +++ b/src/control/Script5.cpp @@ -2476,7 +2476,7 @@ void CTheScripts::HighlightImportantArea(uint32 id, float x1, float y1, float x2 center.x = (infX + supX) / 2; center.y = (infY + supY) / 2; center.z = (z <= MAP_Z_LOW_LIMIT) ? CWorld::FindGroundZForCoord(center.x, center.y) : z; - CShadows::RenderIndicatorShadow(id, 2, gpGoalTex, ¢er, supX - center.x, 0.0f, 0.0f, center.y - supY, 0); + CShadows::RenderIndicatorShadow(id, 2, nil, ¢er, supX - center.x, 0.0f, 0.0f, center.y - supY, 0); } void CTheScripts::HighlightImportantAngledArea(uint32 id, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, float z) @@ -2670,7 +2670,10 @@ void CTheScripts::SetObjectiveForAllPedsInCollective(int colIndex, eObjective ob } else { pPed->bScriptObjectiveCompleted = false; - pPed->SetObjective(objective); + if (objective == OBJECTIVE_LEAVE_CAR) + pPed->SetObjective(objective); + else + pPed->SetObjective(objective, pPed->m_pMyVehicle); } } } @@ -2766,7 +2769,7 @@ void CTheScripts::CleanUpThisPed(CPed* pPed) flees = true; } pPed->ClearObjective(); - pPed->SetWaitState(WAITSTATE_FALSE, nil); // third parameter is 0 TODO? + pPed->SetWaitState(WAITSTATE_FALSE, nil); pPed->bRespondsToThreats = true; pPed->bScriptObjectiveCompleted = false; pPed->bKindaStayInSamePlace = false; |