The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-30 13:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Sergeanur 2020-12-15 04:16:29 +02:00
parent ab3e258f19
commit ac95138c18
4 changed files with 5 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/control/Script5.cpp
View File

@ -2122,9 +2122,6 @@ void CTheScripts::CleanUpThisPed(CPed* pPed)
if (pPed->IsPedInControl()) if (pPed->IsPedInControl())
pPed->SetWanderPath(CGeneral::GetRandomNumber() & 7); pPed->SetWanderPath(CGeneral::GetRandomNumber() & 7);
if (flees) { if (flees) {
if (pPed->m_nPedState == PED_FOLLOW_PATH && state != PED_FOLLOW_PATH)
pPed->ClearFollowPath();
pPed->SetPedState(state); pPed->SetPedState(state);
pPed->SetMoveState(ms); pPed->SetMoveState(ms);
} }

38
src/peds/Ped.cpp
View File

@ -2606,40 +2606,6 @@ CPed::ProcessControl(void)
case PED_WANDER_PATH: case PED_WANDER_PATH:
WanderPath(); WanderPath();
break; break;
case PED_SEEK_POS:
case PED_SEEK_ENTITY:
case PED_PURSUE:
case PED_SNIPER_MODE:
case PED_ROCKET_MODE:
case PED_DUMMY:
case PED_FACE_PHONE:
case PED_MAKE_CALL:
case PED_MUG:
case PED_AI_CONTROL:
case PED_FOLLOW_ROUTE:
case PED_CPR:
case PED_SOLICIT:
case PED_STEP_AWAY:
case PED_SUN_BATHE:
case PED_FLASH:
case PED_JOG:
case PED_UNKNOWN:
case PED_STATES_NO_AI:
case PED_ABSEIL:
case PED_SIT:
case PED_JUMP:
case PED_STAGGER:
case PED_DIVE_AWAY:
case PED_STATES_NO_ST:
case PED_ARREST_PLAYER:
case PED_PASSENGER:
case PED_TAXI_PASSENGER:
case PED_OPEN_DOOR:
case PED_DEAD:
case PED_DRAG_FROM_CAR:
case PED_STEAL_CAR:
case PED_EXIT_CAR:
break;
case PED_ENTER_CAR: case PED_ENTER_CAR:
case PED_CARJACK: case PED_CARJACK:
{ {
@ -6446,7 +6412,7 @@ CPed::SetFollowPathStatic(void)
if (m_nLastPedState == PED_NONE) if (m_nLastPedState == PED_NONE)
m_nLastPedState = oldLastState; m_nLastPedState = oldLastState;
m_nPedState = PED_FOLLOW_PATH; SetPedState(PED_FOLLOW_PATH);
m_nMoveState = m_followPathMoveState; m_nMoveState = m_followPathMoveState;
} else { } else {
RestorePreviousState(); RestorePreviousState();
@ -6826,7 +6792,7 @@ CPed::SetFollowPathDynamic(void)
if (m_nLastPedState == PED_NONE) if (m_nLastPedState == PED_NONE)
m_nLastPedState = oldLastState; m_nLastPedState = oldLastState;
m_nPedState = PED_FOLLOW_PATH; SetPedState(PED_FOLLOW_PATH);
m_nMoveState = m_followPathMoveState; m_nMoveState = m_followPathMoveState;
return true; return true;

2
src/peds/Ped.h
View File

@ -974,7 +974,7 @@ public:
PedState GetPedState(void) { return m_nPedState; } PedState GetPedState(void) { return m_nPedState; }
void SetPedState(PedState state) void SetPedState(PedState state)
{ {
if (GetPedState() == PED_FOLLOW_PATH) if (GetPedState() == PED_FOLLOW_PATH && state != PED_FOLLOW_PATH)
ClearFollowPath(); ClearFollowPath();
m_nPedState = state; m_nPedState = state;
} }

42
src/peds/PlayerPed.cpp
View File

@ -1787,46 +1787,6 @@ CPlayerPed::ProcessControl(void)
if (IsPedInControl() && m_nPedState != PED_ANSWER_MOBILE && padUsed) if (IsPedInControl() && m_nPedState != PED_ANSWER_MOBILE && padUsed)
ProcessPlayerWeapon(padUsed); ProcessPlayerWeapon(padUsed);
break; break;
case PED_LOOK_ENTITY:
case PED_LOOK_HEADING:
case PED_WANDER_RANGE:
case PED_WANDER_PATH:
case PED_PURSUE:
case PED_FOLLOW_PATH:
case PED_ROCKET_MODE:
case PED_DUMMY:
case PED_PAUSE:
case PED_FACE_PHONE:
case PED_MAKE_CALL:
case PED_CHAT:
case PED_MUG:
case PED_AI_CONTROL:
case PED_FOLLOW_ROUTE:
case PED_CPR:
case PED_SOLICIT:
case PED_BUY_ICECREAM:
case PED_INVESTIGATE:
case PED_STEP_AWAY:
case PED_ON_FIRE:
case PED_SUN_BATHE:
case PED_FLASH:
case PED_JOG:
case PED_UNKNOWN:
case PED_STATES_NO_AI:
case PED_ABSEIL:
case PED_SIT:
case PED_STAGGER:
case PED_DIVE_AWAY:
case PED_STATES_NO_ST:
case PED_ARREST_PLAYER:
case PED_DRIVING:
case PED_PASSENGER:
case PED_TAXI_PASSENGER:
case PED_OPEN_DOOR:
case PED_DIE:
case PED_DEAD:
case PED_HANDS_UP:
break;
case PED_SEEK_ENTITY: case PED_SEEK_ENTITY:
m_vecSeekPos = m_pSeekTarget->GetPosition(); m_vecSeekPos = m_pSeekTarget->GetPosition();
@ -1906,6 +1866,8 @@ CPlayerPed::ProcessControl(void)
if (m_nLastPedState == PED_DRAG_FROM_CAR && m_pVehicleAnim) if (m_nLastPedState == PED_DRAG_FROM_CAR && m_pVehicleAnim)
BeingDraggedFromCar(); BeingDraggedFromCar();
break; break;
default:
break;
} }
if (padUsed && IsPedShootable() && m_nPedState != PED_ANSWER_MOBILE && m_nLastPedState != PED_ANSWER_MOBILE) { if (padUsed && IsPedShootable() && m_nPedState != PED_ANSWER_MOBILE && m_nLastPedState != PED_ANSWER_MOBILE) {
ProcessWeaponSwitch(padUsed); ProcessWeaponSwitch(padUsed);