summaryrefslogtreecommitdiffstats
path: root/src/control/Script.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-06-07 11:45:53 +0200
committereray orçunus <erayorcunus@gmail.com>2020-06-07 11:45:53 +0200
commitd1a02e6ddcd9addf60248db57ed241db6c0b98a0 (patch)
tree7765b6594a93dfce1973a88d84229fdd91643ce2 /src/control/Script.cpp
parentfix (diff)
downloadre3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar.gz
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar.bz2
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar.lz
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar.xz
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.tar.zst
re3-d1a02e6ddcd9addf60248db57ed241db6c0b98a0.zip
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r--src/control/Script.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index a2c60872..c7154987 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1531,7 +1531,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
CPed* pTestedPed = ped->m_nearPeds[i];
if (!pTestedPed || !IsPedPointerValid(pTestedPed))
continue;
- if (pTestedPed->m_pedInObjective == ped && pTestedPed->m_objective == OBJ_15) {
+ if (pTestedPed->m_pedInObjective == ped && pTestedPed->m_objective == OBJECTIVE_FOLLOW_PED_IN_FORMATION) {
CVector vFollowerPos = pTestedPed->GetFormationPosition();
CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
bool bFound = false;
@@ -10678,7 +10678,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
assert(pTargetPed);
pPed->bScriptObjectiveCompleted = false;
- pPed->SetObjective(OBJECTIVE_FOLLOW_PED_IN_FORMATION, pPed);
+ pPed->SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING, pPed);
return 0;
}
//case COMMAND_IS_PICKUP_IN_ZONE:
@@ -10713,8 +10713,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
assert(pTargetPed);
pPed->bScriptObjectiveCompleted = false;
- debug("SET_CHAR_OBJ_AIM_GUN_AT_CHAR is not implemented\n");
- //pPed->SetObjective(OBJECTIVE_AIM_GUN_AT_PED, pTargetPed); // TODO(MIAMI) -- when objective is implemented
+ pPed->SetObjective(OBJECTIVE_AIM_GUN_AT_PED, pTargetPed);
return 0;
}
case COMMAND_SWITCH_SECURITY_CAMERA:
@@ -11122,8 +11121,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
pos.y = *(float*)&ScriptParams[2];
pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
pPed->bScriptObjectiveCompleted = false;
- debug("SET_CHAR_OBJ_SPRINT_TO_COORD is not implemented\n");
- //pPed->SetObjective(OBJECTIVE_SPRINT_TO_COORD, pos); // TODO(MIAMI) -- when objective is implemented
+ pPed->SetObjective(OBJECTIVE_SPRINT_TO_COORD, pos);
return 0;
}
case COMMAND_CREATE_SWAT_ROPE: