crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity

Car entering cancel test

Browse Source
This commit is contained in:
erorcun 2020-12-21 02:06:00 +03:00
parent 43b4c8dd33
commit 6b33765891
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/peds/Ped.cpp
View File

@ -2677,36 +2677,15 @@ CPed::ProcessControl(void)
} }
} }
switch (m_nPedState) {
case PED_IDLE:
Idle();
break;
case PED_LOOK_ENTITY:
case PED_LOOK_HEADING:
Look();
break;
case PED_WANDER_RANGE:
WanderRange();
CheckAroundForPossibleCollisions();
break;
case PED_WANDER_PATH:
WanderPath();
break;
case PED_ENTER_CAR:
case PED_CARJACK:
{
#ifdef CANCELLABLE_CAR_ENTER #ifdef CANCELLABLE_CAR_ENTER
if (!IsPlayer() || !m_pVehicleAnim) static bool cancelJack = false;
break; if (IsPlayer()) {
if (EnteringCar() && m_pVehicleAnim) {
CPad *pad = CPad::GetPad(0); CPad *pad = CPad::GetPad(0);
if (pad->ArePlayerControlsDisabled()) if (!pad->ArePlayerControlsDisabled()) {
break;
int vehAnim = m_pVehicleAnim->animId; int vehAnim = m_pVehicleAnim->animId;
static bool cancelJack = false;
int16 padWalkX = pad->GetPedWalkLeftRight(); int16 padWalkX = pad->GetPedWalkLeftRight();
int16 padWalkY = pad->GetPedWalkUpDown(); int16 padWalkY = pad->GetPedWalkUpDown();
if (Abs(padWalkX) > 0.0f || Abs(padWalkY) > 0.0f) { if (Abs(padWalkX) > 0.0f || Abs(padWalkY) > 0.0f) {
@ -2734,9 +2713,30 @@ CPed::ProcessControl(void)
cancelJack = false; cancelJack = false;
bCancelEnteringCar = true; bCancelEnteringCar = true;
} }
#endif
break;
} }
} else
cancelJack = false;
}
#endif
switch (m_nPedState) {
case PED_IDLE:
Idle();
break;
case PED_LOOK_ENTITY:
case PED_LOOK_HEADING:
Look();
break;
case PED_WANDER_RANGE:
WanderRange();
CheckAroundForPossibleCollisions();
break;
case PED_WANDER_PATH:
WanderPath();
break;
case PED_ENTER_CAR:
case PED_CARJACK:
break;
case PED_FLEE_POS: case PED_FLEE_POS:
ms_vec2DFleePosition.x = m_fleeFromPosX; ms_vec2DFleePosition.x = m_fleeFromPosX;
ms_vec2DFleePosition.y = m_fleeFromPosY; ms_vec2DFleePosition.y = m_fleeFromPosY;