More cleanup. I've eliminated all the temporary global variables I've added

over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)

svn-id: r11309

1 files changed, 3 insertions, 3 deletions

diff --git a/sword2/memory.h b/sword2/memory.h
index 51c203265f..57f972185e 100644
--- a/sword2/memory.h
+++ b/sword2/memory.h
@@ -66,6 +66,8 @@ enum {
 
 class MemoryManager {
 private:
+	Sword2Engine *_vm;
+
 	// Address of init malloc to be freed later
 	uint8 *_freeMemman;
 
@@ -92,7 +94,7 @@ public:
 	mem _memList[MAX_mem_blocks];
 	uint32 _baseMemBlock;
 
-	MemoryManager(void);
+	MemoryManager(Sword2Engine *vm);
 	~MemoryManager(void);
 
 	int32 ptrToInt(const uint8 *p);
@@ -108,8 +110,6 @@ public:
 	void memoryString(char *string);
 };
 
-extern MemoryManager *memory;
-
 } // End of namespace Sword2
 
 #endif