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

New ped objectives

Browse source
This commit is contained in:
eray orçunus 2020-06-07 12:45:53 +03:00
parent db9057f5a8
commit d1a02e6ddc
4 changed files with 158 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/control/Script.cpp
View file

@ -1531,7 +1531,7 @@ int8 CRunningScript::ProcessCommands0To99(int32 command)
CPed* pTestedPed = ped->m_nearPeds[i]; CPed* pTestedPed = ped->m_nearPeds[i];
if (!pTestedPed || !IsPedPointerValid(pTestedPed)) if (!pTestedPed || !IsPedPointerValid(pTestedPed))
continue; 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(); CVector vFollowerPos = pTestedPed->GetFormationPosition();
CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped); CTheScripts::ClearSpaceForMissionEntity(vFollowerPos, ped);
bool bFound = false; bool bFound = false;
@ -10678,7 +10678,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]); CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
assert(pTargetPed); assert(pTargetPed);
pPed->bScriptObjectiveCompleted = false; pPed->bScriptObjectiveCompleted = false;
pPed->SetObjective(OBJECTIVE_FOLLOW_PED_IN_FORMATION, pPed); pPed->SetObjective(OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING, pPed);
return 0; return 0;
} }
//case COMMAND_IS_PICKUP_IN_ZONE: //case COMMAND_IS_PICKUP_IN_ZONE:
@ -10713,8 +10713,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]); CPed* pTargetPed = CPools::GetPedPool()->GetAt(ScriptParams[1]);
assert(pTargetPed); assert(pTargetPed);
pPed->bScriptObjectiveCompleted = false; pPed->bScriptObjectiveCompleted = false;
debug("SET_CHAR_OBJ_AIM_GUN_AT_CHAR is not implemented\n"); pPed->SetObjective(OBJECTIVE_AIM_GUN_AT_PED, pTargetPed);
//pPed->SetObjective(OBJECTIVE_AIM_GUN_AT_PED, pTargetPed); // TODO(MIAMI) -- when objective is implemented
return 0; return 0;
} }
case COMMAND_SWITCH_SECURITY_CAMERA: case COMMAND_SWITCH_SECURITY_CAMERA:
@ -11122,8 +11121,7 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
pos.y = *(float*)&ScriptParams[2]; pos.y = *(float*)&ScriptParams[2];
pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y); pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
pPed->bScriptObjectiveCompleted = false; pPed->bScriptObjectiveCompleted = false;
debug("SET_CHAR_OBJ_SPRINT_TO_COORD is not implemented\n"); pPed->SetObjective(OBJECTIVE_SPRINT_TO_COORD, pos);
//pPed->SetObjective(OBJECTIVE_SPRINT_TO_COORD, pos); // TODO(MIAMI) -- when objective is implemented
return 0; return 0;
} }
case COMMAND_CREATE_SWAT_ROPE: case COMMAND_CREATE_SWAT_ROPE:

241
src/peds/Ped.cpp
View file

@ -2815,14 +2815,13 @@ CPed::CanSeeEntity(CEntity *entity, float threshold = CAN_SEE_ENTITY_ANGLE_THRES
return neededTurn < threshold || TWOPI - threshold < neededTurn; return neededTurn < threshold || TWOPI - threshold < neededTurn;
} }
// --MIAMI: Done
bool bool
CPed::IsTemporaryObjective(eObjective objective) CPed::IsTemporaryObjective(eObjective objective)
{ {
return objective == OBJECTIVE_LEAVE_VEHICLE || objective == OBJECTIVE_SET_LEADER || return objective == OBJECTIVE_LEAVE_VEHICLE || objective == OBJECTIVE_SET_LEADER ||
#ifdef VC_PED_PORTS objective == OBJECTIVE_LEAVE_CAR_AND_DIE || objective == OBJECTIVE_ENTER_CAR_AS_DRIVER ||
objective == OBJECTIVE_LEAVE_CAR_AND_DIE || objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
#endif
objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
} }
void void
@ -2831,6 +2830,7 @@ CPed::SetMoveState(eMoveState state)
m_nMoveState = state; m_nMoveState = state;
} }
// --MIAMI: Done
void void
CPed::SetObjectiveTimer(int time) CPed::SetObjectiveTimer(int time)
{ {
@ -2841,6 +2841,7 @@ CPed::SetObjectiveTimer(int time)
} }
} }
// --MIAMI: Done
void void
CPed::ForceStoredObjective(eObjective objective) CPed::ForceStoredObjective(eObjective objective)
{ {
@ -2849,49 +2850,65 @@ CPed::ForceStoredObjective(eObjective objective)
return; return;
} }
switch (m_objective) switch (m_objective) {
{
case OBJECTIVE_FLEE_TILL_SAFE: case OBJECTIVE_FLEE_TILL_SAFE:
case OBJECTIVE_KILL_CHAR_ON_FOOT: case OBJECTIVE_KILL_CHAR_ON_FOOT:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE: case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS: case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
case OBJECTIVE_GOTO_CHAR_ON_FOOT: case OBJECTIVE_GOTO_CHAR_ON_FOOT:
case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
case OBJECTIVE_HASSLE_CHAR:
case OBJECTIVE_ENTER_CAR_AS_PASSENGER: case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
case OBJECTIVE_ENTER_CAR_AS_DRIVER: case OBJECTIVE_ENTER_CAR_AS_DRIVER:
case OBJECTIVE_GOTO_AREA_ON_FOOT: case OBJECTIVE_GOTO_AREA_ON_FOOT:
case OBJECTIVE_RUN_TO_AREA: case OBJECTIVE_RUN_TO_AREA:
case OBJECTIVE_USE_SEAT_ATTRACTOR:
case OBJECTIVE_USE_ATM_ATTRACTOR:
case OBJECTIVE_USE_STOP_ATTRACTOR:
case OBJECTIVE_USE_PIZZA_ATTRACTOR:
case OBJECTIVE_USE_SHELTER_ATTRACTOR:
case OBJECTIVE_SPRINT_TO_COORD:
case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
return; return;
default: default:
m_prevObjective = m_objective; m_prevObjective = m_objective;
} }
} }
// --MIAMI: Done
void void
CPed::SetStoredObjective(void) CPed::SetStoredObjective(void)
{ {
if (m_objective == m_prevObjective) if (m_objective == m_prevObjective)
return; return;
switch (m_objective) switch (m_objective) {
{
case OBJECTIVE_FLEE_TILL_SAFE: case OBJECTIVE_FLEE_TILL_SAFE:
case OBJECTIVE_KILL_CHAR_ON_FOOT: case OBJECTIVE_KILL_CHAR_ON_FOOT:
case OBJECTIVE_KILL_CHAR_ANY_MEANS: case OBJECTIVE_KILL_CHAR_ANY_MEANS:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE: case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS: case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
case OBJECTIVE_GOTO_CHAR_ON_FOOT: case OBJECTIVE_GOTO_CHAR_ON_FOOT:
case OBJECTIVE_FOLLOW_PED_IN_FORMATION: case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
case OBJECTIVE_LEAVE_VEHICLE: case OBJECTIVE_HASSLE_CHAR:
case OBJECTIVE_ENTER_CAR_AS_PASSENGER: case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
case OBJECTIVE_ENTER_CAR_AS_DRIVER: case OBJECTIVE_ENTER_CAR_AS_DRIVER:
case OBJECTIVE_GOTO_AREA_ON_FOOT: case OBJECTIVE_GOTO_AREA_ON_FOOT:
case OBJECTIVE_RUN_TO_AREA: case OBJECTIVE_RUN_TO_AREA:
case OBJECTIVE_USE_SEAT_ATTRACTOR:
case OBJECTIVE_USE_ATM_ATTRACTOR:
case OBJECTIVE_USE_STOP_ATTRACTOR:
case OBJECTIVE_USE_PIZZA_ATTRACTOR:
case OBJECTIVE_USE_SHELTER_ATTRACTOR:
case OBJECTIVE_SPRINT_TO_COORD:
case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
return; return;
default: default:
m_prevObjective = m_objective; m_prevObjective = m_objective;
} }
} }
// --MIAMI: Done
void void
CPed::RestorePreviousObjective(void) CPed::RestorePreviousObjective(void)
{ {
@ -2899,10 +2916,7 @@ CPed::RestorePreviousObjective(void)
return; return;
if (m_objective != OBJECTIVE_LEAVE_VEHICLE && m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER if (m_objective != OBJECTIVE_LEAVE_VEHICLE && m_objective != OBJECTIVE_ENTER_CAR_AS_PASSENGER && m_objective != OBJECTIVE_ENTER_CAR_AS_DRIVER
#ifdef VC_PED_PORTS && m_nPedState != PED_CARJACK)
&& m_nPedState != PED_CARJACK
#endif
)
m_pedInObjective = nil; m_pedInObjective = nil;
if (m_objective == OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT) { if (m_objective == OBJECTIVE_WAIT_IN_CAR_THEN_GETOUT) {
@ -2926,6 +2940,7 @@ CPed::SetLeader(CEntity *leader)
m_leader->RegisterReference((CEntity **)&m_leader); m_leader->RegisterReference((CEntity **)&m_leader);
} }
// TODO(Miami)
void void
CPed::SetObjective(eObjective newObj, void *entity) CPed::SetObjective(eObjective newObj, void *entity)
{ {
@ -2941,7 +2956,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
if (entity == this) if (entity == this)
return; return;
SetObjectiveTimer(0);
if (m_objective == newObj) { if (m_objective == newObj) {
switch (newObj) { switch (newObj) {
case OBJECTIVE_KILL_CHAR_ON_FOOT: case OBJECTIVE_KILL_CHAR_ON_FOOT:
@ -2952,7 +2966,6 @@ CPed::SetObjective(eObjective newObj, void *entity)
case OBJECTIVE_FIGHT_CHAR: case OBJECTIVE_FIGHT_CHAR:
if (m_pedInObjective == entity) if (m_pedInObjective == entity)
return; return;
break; break;
case OBJECTIVE_LEAVE_VEHICLE: case OBJECTIVE_LEAVE_VEHICLE:
case OBJECTIVE_FLEE_CAR: case OBJECTIVE_FLEE_CAR:
@ -2967,12 +2980,14 @@ CPed::SetObjective(eObjective newObj, void *entity)
case OBJECTIVE_BUY_ICE_CREAM: case OBJECTIVE_BUY_ICE_CREAM:
if (m_carInObjective == entity) if (m_carInObjective == entity)
return; return;
break; break;
case OBJECTIVE_SET_LEADER: case OBJECTIVE_SET_LEADER:
if (m_leader == entity) if (m_leader == entity)
return; return;
break;
case OBJECTIVE_AIM_GUN_AT_PED:
if (m_pedInObjective == entity)
return;
break; break;
default: default:
break; break;
@ -2986,9 +3001,8 @@ CPed::SetObjective(eObjective newObj, void *entity)
return; return;
} }
#ifdef VC_PED_PORTS
ClearPointGunAt(); ClearPointGunAt();
#endif m_objectiveTimer = 0;
bObjectiveCompleted = false; bObjectiveCompleted = false;
if (!IsTemporaryObjective(m_objective) || IsTemporaryObjective(newObj)) { if (!IsTemporaryObjective(m_objective) || IsTemporaryObjective(newObj)) {
if (m_objective != newObj) { if (m_objective != newObj) {
@ -3022,6 +3036,8 @@ CPed::SetObjective(eObjective newObj, void *entity)
case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE: case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS: case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
case OBJECTIVE_GOTO_CHAR_ON_FOOT: case OBJECTIVE_GOTO_CHAR_ON_FOOT:
case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
case OBJECTIVE_HASSLE_CHAR:
case OBJECTIVE_FIGHT_CHAR: case OBJECTIVE_FIGHT_CHAR:
m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f); m_vecSeekPos = CVector(0.0f, 0.0f, 0.0f);
m_pedInObjective = (CPed*)entity; m_pedInObjective = (CPed*)entity;
@ -3081,6 +3097,10 @@ CPed::SetObjective(eObjective newObj, void *entity)
SetLeader((CEntity*)entity); SetLeader((CEntity*)entity);
RestorePreviousObjective(); RestorePreviousObjective();
break; break;
case OBJECTIVE_AIM_GUN_AT_PED:
m_pedInObjective = (CPed*)entity;
m_pedInObjective->RegisterReference((CEntity**)&m_pedInObjective);
break;
default: default:
break; break;
} }
@ -3103,21 +3123,16 @@ CPed::SetIdle(void)
} }
} }
// --MIAMI: Done
void void
CPed::SetObjective(eObjective newObj) CPed::SetObjective(eObjective newObj)
{ {
if (DyingOrDead()) if (DyingOrDead() || m_attachedTo)
return; return;
if (newObj == OBJECTIVE_NONE) { if (newObj == OBJECTIVE_NONE) {
if ((m_objective == OBJECTIVE_LEAVE_VEHICLE || m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER if ((m_objective == OBJECTIVE_LEAVE_VEHICLE || m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER
#ifdef VC_PED_PORTS || m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE) && !IsPlayer() && !IsPedInControl()) {
|| m_objective == OBJECTIVE_LEAVE_CAR_AND_DIE)
&& !IsPlayer()
#else
)
#endif
&& !IsPedInControl()) {
bStartWanderPathOnFoot = true; bStartWanderPathOnFoot = true;
return; return;
@ -3194,6 +3209,7 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
} }
} }
// --MIAMI: Done
void void
CPed::ClearChat(void) CPed::ClearChat(void)
{ {
@ -3205,6 +3221,11 @@ CPed::ClearChat(void)
bIsTalking = false; bIsTalking = false;
ClearLookFlag(); ClearLookFlag();
RestorePreviousState(); RestorePreviousState();
if (m_objective == OBJECTIVE_BUY_ICE_CREAM) {
bBoughtIceCream = true;
SetObjective(OBJECTIVE_NONE);
SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
}
} }
bool bool
@ -4555,28 +4576,23 @@ CPed::ClearLook(void)
ClearLookFlag(); ClearLookFlag();
} }
// --MIAMI: Done
void void
CPed::ClearObjective(void) CPed::ClearObjective(void)
{ {
if (IsPedInControl() || m_nPedState == PED_DRIVING) { if (IsPedInControl() || m_nPedState == PED_DRIVING) {
m_objective = OBJECTIVE_NONE; m_objective = OBJECTIVE_NONE;
#ifdef VC_PED_PORTS
m_pedInObjective = nil; m_pedInObjective = nil;
m_carInObjective = nil; m_carInObjective = nil;
#endif
if (m_nPedState == PED_DRIVING && m_pMyVehicle) { if (m_nPedState == PED_DRIVING && m_pMyVehicle) {
if (m_pMyVehicle->pDriver != this) { if (m_pMyVehicle->pDriver != this) {
#ifdef VC_PED_PORTS
if(!IsPlayer()) if(!IsPlayer())
#endif
bWanderPathAfterExitingCar = true; bWanderPathAfterExitingCar = true;
SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle); SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
} }
#ifdef VC_PED_PORTS
m_nLastPedState = PED_NONE; m_nLastPedState = PED_NONE;
#endif
} else { } else {
SetIdle(); SetIdle();
SetMoveState(PEDMOVE_STILL); SetMoveState(PEDMOVE_STILL);
@ -8086,7 +8102,9 @@ CPed::Seek(void)
} else if (m_objective != OBJECTIVE_FOLLOW_PED_IN_FORMATION) { } else if (m_objective != OBJECTIVE_FOLLOW_PED_IN_FORMATION) {
if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning) if (m_objective == OBJECTIVE_SPRINT_TO_COORD)
nextMove = PEDMOVE_SPRINT;
else if (m_objective == OBJECTIVE_KILL_CHAR_ON_FOOT || m_objective == OBJECTIVE_KILL_CHAR_ANY_MEANS || m_objective == OBJECTIVE_RUN_TO_AREA || bIsRunning)
nextMove = PEDMOVE_RUN; nextMove = PEDMOVE_RUN;
else else
nextMove = PEDMOVE_WALK; nextMove = PEDMOVE_WALK;
@ -8108,7 +8126,7 @@ CPed::Seek(void)
} }
if (seekPosDist >= distanceToCountItDone) { if (seekPosDist >= distanceToCountItDone) {
if (bIsRunning) if (bIsRunning && nextMove != PEDMOVE_SPRINT)
nextMove = PEDMOVE_RUN; nextMove = PEDMOVE_RUN;
if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer) { if (CTimer::GetTimeInMilliseconds() <= m_nPedStateTimer) {
@ -8180,7 +8198,9 @@ CPed::Seek(void)
m_actionY = 0; m_actionY = 0;
} }
if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS) { if (m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_COORD ||
m_objective == OBJECTIVE_GOTO_AREA_ANY_MEANS) {
if (m_pNextPathNode) if (m_pNextPathNode)
m_pNextPathNode = nil; m_pNextPathNode = nil;
else else
@ -10326,6 +10346,7 @@ CPed::ProcessControl(void)
&& (!IsPlayer() && (!IsPlayer()
|| m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT
|| m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_RUN_TO_AREA
|| m_objective == OBJECTIVE_SPRINT_TO_COORD
|| m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)) { || m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER)) {
if (collidingVeh != m_pCurrentPhysSurface || IsPlayer()) { if (collidingVeh != m_pCurrentPhysSurface || IsPlayer()) {
@ -11166,7 +11187,7 @@ CPed::ProcessControl(void)
if (!IsPlayer() && m_pMyVehicle->IsBoat() if (!IsPlayer() && m_pMyVehicle->IsBoat()
&& FindPlayerPed()->m_pCurrentPhysSurface == m_pMyVehicle && FindPlayerPed()->m_pCurrentPhysSurface == m_pMyVehicle
&& CharCreatedBy != MISSION_CHAR || !bIsPlayerFriend) { && CharCreatedBy != MISSION_CHAR || !bIsPlayerFriend) {
SetObjective(OBJ_50, FindPlayerPed()); SetObjective(OBJECTIVE_KILL_CHAR_ON_BOAT, FindPlayerPed());
Say(SOUND_PED_CAR_JACKED); Say(SOUND_PED_CAR_JACKED);
} }
@ -12290,10 +12311,11 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
veh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS; veh->AutoPilot.m_nDrivingStyle = DRIVINGSTYLE_AVOID_CARS;
veh->AutoPilot.m_nCruiseSpeed = 25; veh->AutoPilot.m_nCruiseSpeed = 25;
} }
ped->m_nPedState = PED_DRIVING; ped->SetPedState(PED_DRIVING);
if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) { if (ped->m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER) {
if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT) if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_COORD || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
ped->m_prevObjective = OBJECTIVE_NONE; ped->m_prevObjective = OBJECTIVE_NONE;
ped->RestorePreviousObjective(); ped->RestorePreviousObjective();
@ -12319,7 +12341,8 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
} }
} }
ped->m_nPedState = PED_DRIVING; ped->m_nPedState = PED_DRIVING;
if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT) if (ped->m_prevObjective == OBJECTIVE_RUN_TO_AREA || ped->m_prevObjective == OBJECTIVE_GOTO_CHAR_ON_FOOT
|| ped->m_prevObjective == OBJECTIVE_SPRINT_TO_COORD || ped->m_prevObjective == OBJECTIVE_KILL_CHAR_ON_FOOT)
ped->m_prevObjective = OBJECTIVE_NONE; ped->m_prevObjective = OBJECTIVE_NONE;
ped->RestorePreviousObjective(); ped->RestorePreviousObjective();
@ -12342,6 +12365,13 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
case OBJECTIVE_GOTO_AREA_ANY_MEANS: case OBJECTIVE_GOTO_AREA_ANY_MEANS:
case OBJECTIVE_GOTO_AREA_ON_FOOT: case OBJECTIVE_GOTO_AREA_ON_FOOT:
case OBJECTIVE_RUN_TO_AREA: case OBJECTIVE_RUN_TO_AREA:
case OBJECTIVE_USE_SEAT_ATTRACTOR:
case OBJECTIVE_USE_ATM_ATTRACTOR:
case OBJECTIVE_USE_STOP_ATTRACTOR:
case OBJECTIVE_USE_PIZZA_ATTRACTOR:
case OBJECTIVE_USE_SHELTER_ATTRACTOR:
case OBJECTIVE_SPRINT_TO_COORD:
case OBJECTIVE_USE_ICECREAM_ATTRACTOR:
break; break;
default: default:
ped->SetObjective(OBJECTIVE_NONE); ped->SetObjective(OBJECTIVE_NONE);
@ -13205,8 +13235,8 @@ CPed::ProcessObjective(void)
case OBJECTIVE_FOLLOW_CAR_IN_CAR: case OBJECTIVE_FOLLOW_CAR_IN_CAR:
case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE: case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE:
case OBJECTIVE_DESTROY_OBJ: case OBJECTIVE_DESTROY_OBJ:
case OBJECTIVE_26: case OBJECTIVE_GOTO_AREA_IN_CAR:
case OBJECTIVE_27: case OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
case OBJECTIVE_SET_LEADER: case OBJECTIVE_SET_LEADER:
break; break;
case OBJECTIVE_IDLE: case OBJECTIVE_IDLE:
@ -13752,6 +13782,8 @@ CPed::ProcessObjective(void)
break; break;
} }
case OBJECTIVE_GOTO_CHAR_ON_FOOT: case OBJECTIVE_GOTO_CHAR_ON_FOOT:
case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
case OBJECTIVE_HASSLE_CHAR:
{ {
if (m_pedInObjective) { if (m_pedInObjective) {
float safeDistance = 2.0f; float safeDistance = 2.0f;
@ -13797,6 +13829,8 @@ CPed::ProcessObjective(void)
} }
} }
} }
if (m_objective == OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING && m_nMoveState > PEDMOVE_STILL)
SetMoveState(PEDMOVE_WALK);
} }
} else { } else {
SetObjective(OBJECTIVE_NONE); SetObjective(OBJECTIVE_NONE);
@ -14089,8 +14123,9 @@ CPed::ProcessObjective(void)
} }
case OBJECTIVE_GOTO_AREA_ON_FOOT: case OBJECTIVE_GOTO_AREA_ON_FOOT:
case OBJECTIVE_RUN_TO_AREA: case OBJECTIVE_RUN_TO_AREA:
case OBJECTIVE_SPRINT_TO_COORD:
{ {
if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA) if ((m_objective == OBJECTIVE_GOTO_AREA_ON_FOOT || m_objective == OBJECTIVE_RUN_TO_AREA || m_objective == OBJECTIVE_SPRINT_TO_COORD)
&& InVehicle()) { && InVehicle()) {
SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle); SetObjective(OBJECTIVE_LEAVE_VEHICLE, m_pMyVehicle);
} else { } else {
@ -14105,11 +14140,22 @@ CPed::ProcessObjective(void)
CVector bestCoords(0.0f, 0.0f, 0.0f); CVector bestCoords(0.0f, 0.0f, 0.0f);
m_vecSeekPos = m_nextRoutePointPos; m_vecSeekPos = m_nextRoutePointPos;
if (!m_pNextPathNode) if (!m_pNextPathNode) {
FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords); bool found = FindBestCoordsFromNodes(m_vecSeekPos, &bestCoords);
if (m_pNextPathNode) {
// Because it already does that if it finds better coords.
if (!found) {
bestCoords = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
}
if ((bestCoords - GetPosition()).Magnitude2D() < m_distanceToCountSeekDone) {
m_pNextPathNode = nil;
bUsePedNodeSeek = false;
}
}
}
if (m_pNextPathNode) if (m_pNextPathNode)
m_vecSeekPos = m_pNextPathNode->GetPosition(); m_vecSeekPos = CPathFind::TakeWidthIntoAccountForWandering(m_pNextPathNode, m_randomSeed);
} }
SetSeek(m_vecSeekPos, m_distanceToCountSeekDone); SetSeek(m_vecSeekPos, m_distanceToCountSeekDone);
} }
@ -14336,13 +14382,18 @@ CPed::ProcessObjective(void)
SetWanderPath(CGeneral::GetRandomNumber() & 7); SetWanderPath(CGeneral::GetRandomNumber() & 7);
} }
} else { } else {
#ifdef VC_PED_PORTS
m_objective = OBJECTIVE_NONE; m_objective = OBJECTIVE_NONE;
#endif
ClearObjective(); ClearObjective();
} }
break;
} }
// fall through
case OBJECTIVE_WANDER:
if (CTimer::GetTimeInMilliseconds() > m_leaveCarTimer && !bInVehicle) {
m_leaveCarTimer = 0;
m_objective = OBJECTIVE_NONE;
CPed::SetWanderPath(m_nPathDir);
}
break;
case OBJECTIVE_FLEE_CAR: case OBJECTIVE_FLEE_CAR:
if (!bInVehicle && m_nPedState != PED_FLEE_ENTITY && m_pMyVehicle) { if (!bInVehicle && m_nPedState != PED_FLEE_ENTITY && m_pMyVehicle) {
RestorePreviousObjective(); RestorePreviousObjective();
@ -14376,6 +14427,19 @@ CPed::ProcessObjective(void)
} }
} }
break; break;
case OBJECTIVE_AIM_GUN_AT_PED:
if (m_pedInObjective) {
if (!bObstacleShowedUpDuringKillObjective)
SetPointGunAt(m_pedInObjective);
if (m_nMoveState == PEDMOVE_STILL && IsPedInControl()) {
SetLookFlag(m_pedInObjective, false); // TODO(Miami): new parameter: false
TurnBody();
}
} else {
ClearObjective();
}
break;
#ifdef VC_PED_PORTS #ifdef VC_PED_PORTS
case OBJECTIVE_LEAVE_CAR_AND_DIE: case OBJECTIVE_LEAVE_CAR_AND_DIE:
{ {
@ -17617,6 +17681,7 @@ CPed::WarpPedIntoCar(CVehicle *car)
bChangedSeat = true; bChangedSeat = true;
} }
// --MIAMI: Done
void void
CPed::SetObjective(eObjective newObj, float heading, const CVector& pos) CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
{ {
@ -17633,6 +17698,7 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
} }
} }
// --MIAMI: Done
void void
CPed::SetObjective(eObjective newObj, CVector dest) CPed::SetObjective(eObjective newObj, CVector dest)
{ {
@ -17642,9 +17708,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj) if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj)
return; return;
SetObjectiveTimer(0);
if (m_objective == newObj) { if (m_objective == newObj) {
if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) { if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA || newObj == OBJECTIVE_SPRINT_TO_COORD) {
if (m_nextRoutePointPos == dest) if (m_nextRoutePointPos == dest)
return; return;
} else if (newObj == OBJECTIVE_GUARD_SPOT) { } else if (newObj == OBJECTIVE_GUARD_SPOT) {
@ -17653,9 +17718,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
} }
} }
#ifdef VC_PED_PORTS
ClearPointGunAt(); ClearPointGunAt();
#endif m_objectiveTimer = 0;
bObjectiveCompleted = false; bObjectiveCompleted = false;
switch (newObj) { switch (newObj) {
case OBJECTIVE_GUARD_SPOT: case OBJECTIVE_GUARD_SPOT:
@ -17671,6 +17735,8 @@ CPed::SetObjective(eObjective newObj, CVector dest)
case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE: case OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE:
case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS: case OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS:
case OBJECTIVE_GOTO_CHAR_ON_FOOT: case OBJECTIVE_GOTO_CHAR_ON_FOOT:
case OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING:
case OBJECTIVE_HASSLE_CHAR:
case OBJECTIVE_FOLLOW_PED_IN_FORMATION: case OBJECTIVE_FOLLOW_PED_IN_FORMATION:
case OBJECTIVE_LEAVE_VEHICLE: case OBJECTIVE_LEAVE_VEHICLE:
case OBJECTIVE_ENTER_CAR_AS_PASSENGER: case OBJECTIVE_ENTER_CAR_AS_PASSENGER:
@ -17679,6 +17745,27 @@ CPed::SetObjective(eObjective newObj, CVector dest)
case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE: case OBJECTIVE_FIRE_AT_OBJ_FROM_VEHICLE:
case OBJECTIVE_DESTROY_OBJ: case OBJECTIVE_DESTROY_OBJ:
case OBJECTIVE_DESTROY_CAR: case OBJECTIVE_DESTROY_CAR:
case OBJECTIVE_GOTO_AREA_IN_CAR:
case OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET:
case OBJECTIVE_FIGHT_CHAR:
case OBJECTIVE_SET_LEADER:
case OBJECTIVE_FOLLOW_ROUTE:
case OBJECTIVE_SOLICIT:
case OBJECTIVE_HAIL_TAXI:
case OBJECTIVE_CATCH_TRAIN:
case OBJECTIVE_BUY_ICE_CREAM:
case OBJECTIVE_STEAL_ANY_CAR:
case OBJECTIVE_STEAL_ANY_MISSION_CAR:
case OBJECTIVE_MUG_CHAR:
case OBJECTIVE_LEAVE_CAR_AND_DIE:
case OBJECTIVE_FLEE_CAR:
case OBJECTIVE_SUN_BATHE:
case OBJECTIVE_AIM_GUN_AT_PED:
case OBJECTIVE_WANDER:
case OBJECTIVE_WAIT_FOR_RAIN_TO_END:
case OBJECTIVE_KILL_CHAR_ON_BOAT:
case OBJECTIVE_SOLICIT_FOOT:
case OBJECTIVE_WAIT_FOR_BUS:
break; break;
case OBJECTIVE_GOTO_AREA_ANY_MEANS: case OBJECTIVE_GOTO_AREA_ANY_MEANS:
case OBJECTIVE_GOTO_AREA_ON_FOOT: case OBJECTIVE_GOTO_AREA_ON_FOOT:
@ -17728,6 +17815,7 @@ CPed::SetObjective(eObjective newObj, CVector dest)
} }
break; break;
case OBJECTIVE_RUN_TO_AREA: case OBJECTIVE_RUN_TO_AREA:
case OBJECTIVE_SPRINT_TO_COORD:
bIsRunning = true; bIsRunning = true;
m_pNextPathNode = nil; m_pNextPathNode = nil;
m_nextRoutePointPos = dest; m_nextRoutePointPos = dest;
@ -18141,50 +18229,6 @@ CPed::SetCarJack_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
m_pVehicleAnim->SetFinishCallback(PedAnimAlignCB, this); m_pVehicleAnim->SetFinishCallback(PedAnimAlignCB, this);
} }
void
CPed::SetObjective(eObjective newObj, CVector dest, float safeDist)
{
if (DyingOrDead())
return;
if (m_prevObjective != OBJECTIVE_NONE && m_prevObjective == newObj)
return;
SetObjectiveTimer(0);
if (m_objective == newObj) {
if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) {
if (m_nextRoutePointPos == dest && m_distanceToCountSeekDone == safeDist)
return;
} else if (newObj == OBJECTIVE_GUARD_SPOT) {
if (m_vecSeekPosEx == dest && m_distanceToCountSeekDoneEx == safeDist)
return;
}
}
#ifdef VC_PED_PORTS
ClearPointGunAt();
#endif
bObjectiveCompleted = false;
if (IsTemporaryObjective(m_objective)) {
m_prevObjective = newObj;
} else {
if (m_objective != newObj)
SetStoredObjective();
m_objective = newObj;
}
if (newObj == OBJECTIVE_GUARD_SPOT) {
m_vecSeekPosEx = dest;
m_distanceToCountSeekDoneEx = safeDist;
} else if (newObj == OBJECTIVE_GOTO_AREA_ANY_MEANS || newObj == OBJECTIVE_GOTO_AREA_ON_FOOT || newObj == OBJECTIVE_RUN_TO_AREA) {
m_pNextPathNode = nil;
m_nextRoutePointPos = dest;
m_vecSeekPos = m_nextRoutePointPos;
bUsePedNodeSeek = true;
}
}
void void
CPed::SetCarJack(CVehicle* car) CPed::SetCarJack(CVehicle* car)
{ {
@ -18338,6 +18382,7 @@ CPed::SetExitBoat(CVehicle *boat)
m_vecMoveSpeed = boat->m_vecMoveSpeed; m_vecMoveSpeed = boat->m_vecMoveSpeed;
} }
// --MIAMI: Done
void void
CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid) CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
{ {

21
src/peds/Ped.h
View file

@ -182,7 +182,7 @@ enum eWaitState {
enum eObjective : uint32 { enum eObjective : uint32 {
OBJECTIVE_NONE, OBJECTIVE_NONE,
OBJECTIVE_IDLE, OBJECTIVE_IDLE,
OBJ_2, OBJECTIVE_IDLE_COP,
OBJECTIVE_FLEE_TILL_SAFE, OBJECTIVE_FLEE_TILL_SAFE,
OBJECTIVE_GUARD_SPOT, OBJECTIVE_GUARD_SPOT,
OBJECTIVE_GUARD_AREA, // not implemented OBJECTIVE_GUARD_AREA, // not implemented
@ -193,9 +193,9 @@ enum eObjective : uint32 {
OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE, OBJECTIVE_FLEE_CHAR_ON_FOOT_TILL_SAFE,
OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS, OBJECTIVE_FLEE_CHAR_ON_FOOT_ALWAYS,
OBJECTIVE_GOTO_CHAR_ON_FOOT, OBJECTIVE_GOTO_CHAR_ON_FOOT,
OBJECTIVE_GOTO_CHAR_ON_FOOT_WALKING,
OBJECTIVE_HASSLE_CHAR,
OBJECTIVE_FOLLOW_PED_IN_FORMATION, OBJECTIVE_FOLLOW_PED_IN_FORMATION,
OBJ_14,
OBJ_15,
OBJECTIVE_LEAVE_VEHICLE, OBJECTIVE_LEAVE_VEHICLE,
OBJECTIVE_ENTER_CAR_AS_PASSENGER, OBJECTIVE_ENTER_CAR_AS_PASSENGER,
OBJECTIVE_ENTER_CAR_AS_DRIVER, OBJECTIVE_ENTER_CAR_AS_DRIVER,
@ -206,8 +206,8 @@ enum eObjective : uint32 {
OBJECTIVE_GOTO_AREA_ANY_MEANS, OBJECTIVE_GOTO_AREA_ANY_MEANS,
OBJECTIVE_GOTO_AREA_ON_FOOT, OBJECTIVE_GOTO_AREA_ON_FOOT,
OBJECTIVE_RUN_TO_AREA, OBJECTIVE_RUN_TO_AREA,
OBJECTIVE_26, // not implemented OBJECTIVE_GOTO_AREA_IN_CAR, // not implemented
OBJECTIVE_27, // not implemented OBJECTIVE_FOLLOW_CAR_ON_FOOT_WITH_OFFSET, // not implemented
OBJECTIVE_FIGHT_CHAR, OBJECTIVE_FIGHT_CHAR,
OBJECTIVE_SET_LEADER, OBJECTIVE_SET_LEADER,
OBJECTIVE_FOLLOW_ROUTE, OBJECTIVE_FOLLOW_ROUTE,
@ -216,22 +216,22 @@ enum eObjective : uint32 {
OBJECTIVE_CATCH_TRAIN, OBJECTIVE_CATCH_TRAIN,
OBJECTIVE_BUY_ICE_CREAM, OBJECTIVE_BUY_ICE_CREAM,
OBJECTIVE_STEAL_ANY_CAR, OBJECTIVE_STEAL_ANY_CAR,
OBJ_36, OBJECTIVE_STEAL_ANY_MISSION_CAR,
OBJECTIVE_MUG_CHAR, OBJECTIVE_MUG_CHAR,
OBJECTIVE_LEAVE_CAR_AND_DIE, OBJECTIVE_LEAVE_CAR_AND_DIE,
OBJECTIVE_USE_SEAT_ATTRACTOR, OBJECTIVE_USE_SEAT_ATTRACTOR,
OBJECTIVE_USE_ATM_ATTRACTOR, OBJECTIVE_USE_ATM_ATTRACTOR,
OBJECTIVE_FLEE_CAR, OBJECTIVE_FLEE_CAR,
OBJ_42, OBJECTIVE_SUN_BATHE,
OBJECTIVE_USE_STOP_ATTRACTOR, OBJECTIVE_USE_STOP_ATTRACTOR,
OBJECTIVE_USE_PIZZA_ATTRACTOR, OBJECTIVE_USE_PIZZA_ATTRACTOR,
OBJECTIVE_USE_SHELTER_ATTRACTOR, OBJECTIVE_USE_SHELTER_ATTRACTOR,
OBJECTIVE_AIM_GUN_AT_PED, OBJECTIVE_AIM_GUN_AT_PED,
OBJ_47, OBJECTIVE_WANDER,
OBJECTIVE_WAIT_FOR_RAIN_TO_END, OBJECTIVE_WAIT_FOR_RAIN_TO_END,
OBJECTIVE_SPRINT_TO_COORD, OBJECTIVE_SPRINT_TO_COORD,
OBJ_50, OBJECTIVE_KILL_CHAR_ON_BOAT,
OBJ_51, OBJECTIVE_SOLICIT_FOOT,
OBJECTIVE_WAIT_FOR_BUS, OBJECTIVE_WAIT_FOR_BUS,
OBJECTIVE_USE_ICECREAM_ATTRACTOR, OBJECTIVE_USE_ICECREAM_ATTRACTOR,
OBJECTIVE_PURCHASE_ICECREAM, OBJECTIVE_PURCHASE_ICECREAM,
@ -696,7 +696,6 @@ public:
void SetObjective(eObjective); void SetObjective(eObjective);
void SetObjective(eObjective, int16, int16); void SetObjective(eObjective, int16, int16);
void SetObjective(eObjective, CVector); void SetObjective(eObjective, CVector);
void SetObjective(eObjective, CVector, float);
void SetObjective(eObjective, float, const CVector&); void SetObjective(eObjective, float, const CVector&);
void ClearChat(void); void ClearChat(void);
void InformMyGangOfAttack(CEntity*); void InformMyGangOfAttack(CEntity*);

2
src/vehicles/Bike.cpp
View file

@ -1973,7 +1973,7 @@ CBike::KnockOffRider(eWeaponType weapon, uint8 direction, CPed *ped, bool bGetBa
else if(ped->m_pedStats->m_temper <= ped->m_pedStats->m_fear && else if(ped->m_pedStats->m_temper <= ped->m_pedStats->m_fear &&
ped->CharCreatedBy != MISSION_CHAR && ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE && ped->CharCreatedBy != MISSION_CHAR && ped->m_pMyVehicle->VehicleCreatedBy != MISSION_VEHICLE &&
!CTheScripts::IsPlayerOnAMission()){ !CTheScripts::IsPlayerOnAMission()){
ped->SetObjective(OBJ_47, ped->m_pMyVehicle); ped->SetObjective(OBJECTIVE_WANDER, ped->m_pMyVehicle);
ped->m_nPathDir = CGeneral::GetRandomNumberInRange(0, 8); ped->m_nPathDir = CGeneral::GetRandomNumberInRange(0, 8);
} }
}else if(ped->m_leader == nil){ }else if(ped->m_leader == nil){