6 files changed, 40 insertions, 40 deletions
diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index e5721bdf..82343e93 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -10,12 +10,12 @@
 #include "AnimBlendAssocGroup.h"
 #include "AnimManager.h"
 
-CAnimBlock *CAnimManager::ms_aAnimBlocks = (CAnimBlock*)0x6F01A0;
-CAnimBlendHierarchy *CAnimManager::ms_aAnimations = (CAnimBlendHierarchy*)0x70F430;
-int32 &CAnimManager::ms_numAnimBlocks = *(int32*)0x885AF8;
-int32 &CAnimManager::ms_numAnimations = *(int32*)0x8E2DD4;
-CAnimBlendAssocGroup *&CAnimManager::ms_aAnimAssocGroups = *(CAnimBlendAssocGroup**)0x8F583C;
-CLinkList<CAnimBlendHierarchy*> &CAnimManager::ms_animCache = *(CLinkList<CAnimBlendHierarchy*>*)0x9414DC;
+CAnimBlock CAnimManager::ms_aAnimBlocks[2];
+CAnimBlendHierarchy CAnimManager::ms_aAnimations[250];
+int32 CAnimManager::ms_numAnimBlocks;
+int32 CAnimManager::ms_numAnimations;
+CAnimBlendAssocGroup *CAnimManager::ms_aAnimAssocGroups;
+CLinkList<CAnimBlendHierarchy*> CAnimManager::ms_animCache;
 
 AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_WALK, ASSOC_REPEAT | ASSOC_MOVEMENT | ASSOC_HAS_TRANSLATION | ASSOC_FLAG80 },
diff --git a/src/animation/AnimManager.h b/src/animation/AnimManager.h
index 0d4e17fe..93fec74b 100644
--- a/src/animation/AnimManager.h
+++ b/src/animation/AnimManager.h
@@ -242,12 +242,12 @@ struct AnimAssocDefinition
 class CAnimManager
 {
 	static const AnimAssocDefinition ms_aAnimAssocDefinitions[NUM_ANIM_ASSOC_GROUPS];
-	static CAnimBlock *ms_aAnimBlocks;	//[2]
-	static CAnimBlendHierarchy *ms_aAnimations;	//[250]
-	static int32 &ms_numAnimBlocks;
-	static int32 &ms_numAnimations;
-	static CAnimBlendAssocGroup *&ms_aAnimAssocGroups;
-	static CLinkList<CAnimBlendHierarchy*> &ms_animCache;
+	static CAnimBlock ms_aAnimBlocks[2];
+	static CAnimBlendHierarchy ms_aAnimations[250];
+	static int32 ms_numAnimBlocks;
+	static int32 ms_numAnimations;
+	static CAnimBlendAssocGroup *ms_aAnimAssocGroups;
+	static CLinkList<CAnimBlendHierarchy*> ms_animCache;
 public:
 
 	static void Initialise(void);
diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index 6f8e9790..5c0daaf0 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -117,19 +117,19 @@ FindCutsceneAudioTrackId(const char *szCutsceneName)
 	return -1;
 }
 
-bool &CCutsceneMgr::ms_running = *(bool*)0x95CCF5;
-bool &CCutsceneMgr::ms_cutsceneProcessing = *(bool*)0x95CD9F;
-CDirectory *&CCutsceneMgr::ms_pCutsceneDir = *(CDirectory**)0x8F5F88;
-CCutsceneObject *(&CCutsceneMgr::ms_pCutsceneObjects)[NUMCUTSCENEOBJECTS] = *(CCutsceneObject*(*)[NUMCUTSCENEOBJECTS]) *(uintptr*) 0x862170;
-int32 &CCutsceneMgr::ms_numCutsceneObjs = *(int32*)0x942FA4;
-bool &CCutsceneMgr::ms_loaded = *(bool*)0x95CD95;
-bool &CCutsceneMgr::ms_animLoaded = *(bool*)0x95CDA0;
-bool &CCutsceneMgr::ms_useLodMultiplier = *(bool*)0x95CD74;
-char(&CCutsceneMgr::ms_cutsceneName)[CUTSCENENAMESIZE] = *(char(*)[CUTSCENENAMESIZE]) *(uintptr*)0x70D9D0;
-CAnimBlendAssocGroup &CCutsceneMgr::ms_cutsceneAssociations = *(CAnimBlendAssocGroup*)0x709C58;
-CVector &CCutsceneMgr::ms_cutsceneOffset = *(CVector*)0x8F2C0C;
-float &CCutsceneMgr::ms_cutsceneTimer = *(float*)0x941548;
-uint32 &CCutsceneMgr::ms_cutsceneLoadStatus = *(uint32*)0x95CB40;
+bool CCutsceneMgr::ms_running;
+bool CCutsceneMgr::ms_cutsceneProcessing;
+CDirectory *CCutsceneMgr::ms_pCutsceneDir;
+CCutsceneObject *CCutsceneMgr::ms_pCutsceneObjects[NUMCUTSCENEOBJECTS];
+int32 CCutsceneMgr::ms_numCutsceneObjs;
+bool CCutsceneMgr::ms_loaded;
+bool CCutsceneMgr::ms_animLoaded;
+bool CCutsceneMgr::ms_useLodMultiplier;
+char CCutsceneMgr::ms_cutsceneName[CUTSCENENAMESIZE];
+CAnimBlendAssocGroup CCutsceneMgr::ms_cutsceneAssociations;
+CVector CCutsceneMgr::ms_cutsceneOffset;
+float CCutsceneMgr::ms_cutsceneTimer;
+uint32 CCutsceneMgr::ms_cutsceneLoadStatus;
 
 RpAtomic *
 CalculateBoundingSphereRadiusCB(RpAtomic *atomic, void *data)
diff --git a/src/animation/CutsceneMgr.h b/src/animation/CutsceneMgr.h
index a455e784..bfdcdb57 100644
--- a/src/animation/CutsceneMgr.h
+++ b/src/animation/CutsceneMgr.h
@@ -9,22 +9,22 @@ class CCutsceneHead;
 
 class CCutsceneMgr
 {
-	static bool &ms_running;
-	static CCutsceneObject *(&ms_pCutsceneObjects)[NUMCUTSCENEOBJECTS];
+	static bool ms_running;
+	static CCutsceneObject *ms_pCutsceneObjects[NUMCUTSCENEOBJECTS];
 	
-	static int32 &ms_numCutsceneObjs;
-	static bool &ms_loaded;
-	static bool &ms_animLoaded;
-	static bool &ms_useLodMultiplier;
+	static int32 ms_numCutsceneObjs;
+	static bool ms_loaded;
+	static bool ms_animLoaded;
+	static bool ms_useLodMultiplier;
 
-	static char(&ms_cutsceneName)[CUTSCENENAMESIZE];
-	static CAnimBlendAssocGroup &ms_cutsceneAssociations;
-	static CVector &ms_cutsceneOffset;
-	static float &ms_cutsceneTimer;
-	static bool &ms_cutsceneProcessing;
+	static char ms_cutsceneName[CUTSCENENAMESIZE];
+	static CAnimBlendAssocGroup ms_cutsceneAssociations;
+	static CVector ms_cutsceneOffset;
+	static float ms_cutsceneTimer;
+	static bool ms_cutsceneProcessing;
 public:
-	static CDirectory *&ms_pCutsceneDir;
-	static uint32 &ms_cutsceneLoadStatus;
+	static CDirectory *ms_pCutsceneDir;
+	static uint32 ms_cutsceneLoadStatus;
 
 	static void StartCutsceneProcessing() { ms_cutsceneProcessing = true; }
 	static bool IsRunning(void) { return ms_running; }
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index 9c847139..07b8e7d8 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -8,7 +8,7 @@
 #include "AnimBlendAssociation.h"
 #include "RpAnimBlend.h"
 
-RwInt32 &ClumpOffset = *(RwInt32*)0x8F1B84;
+RwInt32 ClumpOffset;
 
 enum
 {
diff --git a/src/animation/RpAnimBlend.h b/src/animation/RpAnimBlend.h
index f9e14c42..ccfa5872 100644
--- a/src/animation/RpAnimBlend.h
+++ b/src/animation/RpAnimBlend.h
@@ -11,7 +11,7 @@ struct AnimBlendFrameUpdateData
 	CAnimBlendNode *nodes[16];
 };
 
-extern RwInt32 &ClumpOffset;
+extern RwInt32 ClumpOffset;
 #define RPANIMBLENDCLUMPDATA(o) (RWPLUGINOFFSET(CAnimBlendClumpData*, o, ClumpOffset))
 
 bool RpAnimBlendPluginAttach(void);