1 files changed, 49 insertions, 14 deletions

diff --git a/src/animation/AnimBlendSequence.h b/src/animation/AnimBlendSequence.h
index 6d8c98aa..67118b2f 100644
--- a/src/animation/AnimBlendSequence.h
+++ b/src/animation/AnimBlendSequence.h
@@ -2,6 +2,10 @@
 
 #include "Quaternion.h"
 
+#ifdef MoveMemory
+#undef MoveMemory	// windows shit
+#endif
+
 // TODO: put them somewhere else?
 struct KeyFrame {
 	CQuaternion rotation;
@@ -12,6 +16,43 @@ struct KeyFrameTrans : KeyFrame {
 	CVector translation;
 };
 
+struct KeyFrameCompressed {
+	int16 rot[4];		// 4096
+	int16 deltaTime;	// 60
+
+	void GetRotation(CQuaternion *quat){
+		float scale = 1.0f/4096.0f;
+		quat->x = rot[0]*scale;
+		quat->y = rot[1]*scale;
+		quat->z = rot[2]*scale;
+		quat->w = rot[3]*scale;
+	}
+	void SetRotation(const CQuaternion &quat){
+		rot[0] = quat.x * 4096.0f;
+		rot[1] = quat.y * 4096.0f;
+		rot[2] = quat.z * 4096.0f;
+		rot[3] = quat.w * 4096.0f;
+	}
+	float GetDeltaTime(void) { return deltaTime/60.0f; }
+	void SetTime(float t) { deltaTime = t*60.0f + 0.5f; }
+};
+
+struct KeyFrameTransCompressed : KeyFrameCompressed {
+	int16 trans[3];		// 1024
+
+	void GetTranslation(CVector *vec) {
+		float scale = 1.0f/1024.0f;
+		vec->x = trans[0]*scale;
+		vec->y = trans[1]*scale;
+		vec->z = trans[2]*scale;
+	}
+	void SetTranslation(const CVector &vec){
+		trans[0] = vec.x*1024.0f;
+		trans[1] = vec.y*1024.0f;
+		trans[2] = vec.z*1024.0f;
+	}
+};
+
 
 // The sequence of key frames of one animated node
 class CAnimBlendSequence
@@ -24,9 +65,7 @@ public:
 	int32 type;
 	char name[24];
 	int32 numFrames;
-#ifdef PED_SKIN
 	int16 boneTag;
-#endif
 	void *keyFrames;
 	void *keyFramesCompressed;
 
@@ -40,21 +79,17 @@ public:
 			&((KeyFrameTrans*)keyFrames)[n] :
 			&((KeyFrame*)keyFrames)[n];
 	}
-	KeyFrame *GetKeyFrameCompressed(int n) {
+	KeyFrameCompressed *GetKeyFrameCompressed(int n) {
 		return type & KF_TRANS ?
-			&((KeyFrameTrans*)keyFramesCompressed)[n] :
-			&((KeyFrame*)keyFramesCompressed)[n];
+			&((KeyFrameTransCompressed*)keyFramesCompressed)[n] :
+			&((KeyFrameCompressed*)keyFramesCompressed)[n];
 	}
 	bool HasTranslation(void) { return !!(type & KF_TRANS); }
-	// TODO? these are unused
-//	void Uncompress(void);
-//	void CompressKeyframes(void);
-//	void RemoveUncompressedData(void);
+	void Uncompress(void);
+	void CompressKeyframes(void);
+	void RemoveUncompressedData(void);
+	bool MoveMemory(void);
 
-#ifdef PED_SKIN
 	void SetBoneTag(int tag) { boneTag = tag; }
-#endif
 };
-#ifndef PED_SKIN
-VALIDATE_SIZE(CAnimBlendSequence, 0x2C);
-#endif
+VALIDATE_SIZE(CAnimBlendSequence, 0x30);