4 files changed, 2 insertions, 21 deletions

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;