diff options
| author | aap <aap@papnet.eu> | 2020-12-18 17:27:18 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-12-18 17:27:18 +0100 |
| commit | c17ccc50ab76e7f161af484400914db373dcafae (patch) | |
| tree | 99a3172806399c1d79fece17b065e32083441d9c /src/peds | |
| parent | memorymgr fix (diff) | |
| download | re3-c17ccc50ab76e7f161af484400914db373dcafae.tar re3-c17ccc50ab76e7f161af484400914db373dcafae.tar.gz re3-c17ccc50ab76e7f161af484400914db373dcafae.tar.bz2 re3-c17ccc50ab76e7f161af484400914db373dcafae.tar.lz re3-c17ccc50ab76e7f161af484400914db373dcafae.tar.xz re3-c17ccc50ab76e7f161af484400914db373dcafae.tar.zst re3-c17ccc50ab76e7f161af484400914db373dcafae.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/CivilianPed.h | 4 | ||||
| -rw-r--r-- | src/peds/CopPed.h | 4 | ||||
| -rw-r--r-- | src/peds/EmergencyPed.h | 4 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 10 | ||||
| -rw-r--r-- | src/peds/PlayerPed.h | 4 |
5 files changed, 5 insertions, 21 deletions
diff --git a/src/peds/CivilianPed.h b/src/peds/CivilianPed.h index a7fb766b..dcd49a96 100644 --- a/src/peds/CivilianPed.h +++ b/src/peds/CivilianPed.h @@ -23,6 +23,4 @@ public: void EnterVacantNearbyCars(void); bool IsOnStealWishList(int32); }; -#ifndef PED_SKIN -VALIDATE_SIZE(CCivilianPed, 0x53C); -#endif +//VALIDATE_SIZE(CCivilianPed, 0x53C); diff --git a/src/peds/CopPed.h b/src/peds/CopPed.h index 06fe54b0..3f5ae06d 100644 --- a/src/peds/CopPed.h +++ b/src/peds/CopPed.h @@ -48,6 +48,4 @@ public: void ProcessStingerCop(void); }; -#ifndef PED_SKIN -VALIDATE_SIZE(CCopPed, 0x558); -#endif +VALIDATE_SIZE(CCopPed, 0x62C); diff --git a/src/peds/EmergencyPed.h b/src/peds/EmergencyPed.h index 390ba0bd..41bc86e5 100644 --- a/src/peds/EmergencyPed.h +++ b/src/peds/EmergencyPed.h @@ -36,6 +36,4 @@ public: void FiremanAI(void); void MedicAI(void); }; -#ifndef PED_SKIN -VALIDATE_SIZE(CEmergencyPed, 0x554); -#endif +//VALIDATE_SIZE(CEmergencyPed, 0x554); diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index d63a4d22..b402b2fe 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -264,9 +264,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) bVehExitWillBeInstant = false; bHasAlreadyBeenRecorded = false; bFallenDown = false; -#ifdef PED_SKIN bDontAcceptIKLookAts = false; -#endif bReachedAttractorHeadingTarget = false; bTurnedAroundOnAttractor = false; #ifdef KANGAROO_CHEAT @@ -365,9 +363,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) m_vehicleInAccident = nil; m_attractor = nil; m_positionInQueue = -1; -#ifdef PED_SKIN m_pWeaponModel = nil; -#endif m_delayedSoundID = -1; m_delayedSoundTimer = 0; CPopulation::UpdatePedCount((ePedType)m_nPedType, false); @@ -4797,11 +4793,7 @@ CPed::PreRender(void) CTimeCycle::m_fShadowFrontX[CTimeCycle::m_CurrentStoredValue], CTimeCycle::m_fShadowFrontY[CTimeCycle::m_CurrentStoredValue], CTimeCycle::m_fShadowSideX[CTimeCycle::m_CurrentStoredValue], CTimeCycle::m_fShadowSideY[CTimeCycle::m_CurrentStoredValue]); -#ifdef PED_SKIN - if(IsClumpSkinned(GetClump())){ - UpdateRpHAnim(); - } -#endif + UpdateRpHAnim(); bool bIsWindModifierTurnedOn = false; float fAnyDirectionShift = 1.0f; diff --git a/src/peds/PlayerPed.h b/src/peds/PlayerPed.h index e09a67f0..3c58f7f5 100644 --- a/src/peds/PlayerPed.h +++ b/src/peds/PlayerPed.h @@ -108,6 +108,4 @@ public: static const uint32 nSaveStructSize; }; -#ifndef PED_SKIN -VALIDATE_SIZE(CPlayerPed, 0x5F0); -#endif +//VALIDATE_SIZE(CPlayerPed, 0x5F0); |