diff --git a/src/animation/AnimBlendClumpData.h b/src/animation/AnimBlendClumpData.h index af7e5df5..315cbd8a 100644 --- a/src/animation/AnimBlendClumpData.h +++ b/src/animation/AnimBlendClumpData.h @@ -17,19 +17,13 @@ struct AnimBlendFrameData uint8 flag; RwV3d resetPos; -#ifdef PED_SKIN union { RwFrame *frame; RpHAnimStdInterpFrame *hanimFrame; }; int32 nodeID; -#else - RwFrame *frame; -#endif }; -#ifndef PED_SKIN -VALIDATE_SIZE(AnimBlendFrameData, 0x14); -#endif +VALIDATE_SIZE(AnimBlendFrameData, 0x18); class CAnimBlendClumpData @@ -44,8 +38,6 @@ public: CAnimBlendClumpData(void); ~CAnimBlendClumpData(void); void SetNumberOfFrames(int n); -#ifdef PED_SKIN void SetNumberOfBones(int n) { SetNumberOfFrames(n); } -#endif void ForAllFrames(void (*cb)(AnimBlendFrameData*, void*), void *arg); }; diff --git a/src/animation/AnimBlendSequence.cpp b/src/animation/AnimBlendSequence.cpp index b04d6b41..a97dc980 100644 --- a/src/animation/AnimBlendSequence.cpp +++ b/src/animation/AnimBlendSequence.cpp @@ -10,9 +10,7 @@ CAnimBlendSequence::CAnimBlendSequence(void) numFrames = 0; keyFrames = nil; keyFramesCompressed = nil; -#ifdef PED_SKIN boneTag = -1; -#endif } CAnimBlendSequence::~CAnimBlendSequence(void) diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h index 759a12ea..4dce3b13 100644 --- a/src/animation/AnimBlendSequence.h +++ b/src/animation/AnimBlendSequence.h @@ -49,10 +49,6 @@ public: // void CompressKeyframes(void); // void RemoveUncompressedData(void); -#ifdef PED_SKIN void SetBoneTag(int tag) { boneTag = tag; } -#endif }; -#ifndef PED_SKIN -VALIDATE_SIZE(CAnimBlendSequence, 0x2C); -#endif +VALIDATE_SIZE(CAnimBlendSequence, 0x30); diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp index a85149e6..0aa6486b 100644 --- a/src/animation/AnimManager.cpp +++ b/src/animation/AnimManager.cpp @@ -1255,13 +1255,10 @@ CAnimManager::CreateAnimAssocGroups(void) group->firstAnimId = def->animDescs[0].animId; group->CreateAssociations(def->blockName, clump, def->animNames, def->numAnims); for(j = 0; j < group->numAssociations; j++) - // GetAnimation(i) in III (but it's in LoadAnimFiles), GetAnimation(group->animDesc[j].animId) in VC group->GetAnimation(def->animDescs[j].animId)->flags |= def->animDescs[j].flags; -#ifdef PED_SKIN if(IsClumpSkinned(clump)) RpClumpForAllAtomics(clump, AtomicRemoveAnimFromSkinCB, nil); -#endif RpClumpDestroy(clump); } } @@ -1352,10 +1349,8 @@ CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*somename)[32] ROUNDSIZE(anim.size); RwStreamRead(stream, buf, anim.size); int numFrames = *(int*)(buf+28); -#ifdef PED_SKIN if(anim.size == 44) seq->SetBoneTag(*(int*)(buf+40)); -#endif seq->SetName(buf); if(numFrames == 0) continue; diff --git a/src/core/common.h b/src/core/common.h index 181389da..882e2fae 100644 --- a/src/core/common.h +++ b/src/core/common.h @@ -84,10 +84,8 @@ typedef uint16_t wchar; #include "config.h" -#ifdef PED_SKIN #include #include -#endif #ifdef __GNUC__ #define TYPEALIGN(n) __attribute__ ((aligned (n))) diff --git a/src/core/config.h b/src/core/config.h index 4bf1cfc8..0079eb38 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -346,7 +346,6 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually #define CAMERA_PICKUP // Peds -#define PED_SKIN // support for skinned geometry on peds #define CANCELLABLE_CAR_ENTER // Camera diff --git a/src/entities/Entity.h b/src/entities/Entity.h index b2ea7217..9129457c 100644 --- a/src/entities/Entity.h +++ b/src/entities/Entity.h @@ -171,9 +171,7 @@ public: void PruneReferences(void); void CleanUpOldReference(CEntity **pent); -#ifdef PED_SKIN void UpdateRpHAnim(void); -#endif void PreRenderForGlassWindow(void); void AddSteamsFromGround(CVector *unused); 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);