1 files changed, 8 insertions, 6 deletions
diff --git a/sword2/logic.h b/sword2/logic.h
index 426c2a2745..e770e162df 100644
--- a/sword2/logic.h
+++ b/sword2/logic.h
@@ -23,6 +23,8 @@
 #ifndef _LOGIC
 #define _LOGIC
 
+#include "sword2/memory.h"
+
 namespace Sword2 {
 
 struct MovieTextObject;
@@ -51,6 +53,10 @@ class Logic {
 private:
 	Sword2Engine *_vm;
 
+	inline byte *decodePtr(int32 n) {
+		return _vm->_memory->decodePtr(n);
+	}
+
 	uint32 _objectKillList[OBJECT_KILL_LIST_SIZE];
 
 	// keeps note of no. of objects in the kill list
@@ -118,12 +124,6 @@ private:
 	void formText(int32 *params);
 	bool wantSpeechForLine(uint32 wavId);
 
-	int16 _standbyX;	// see fnSetStandbyCoords()
-	int16 _standbyY;
-	int16 _standbyDir;
-
-	int whatTarget(int startX, int startY, int destX, int destY);
-
 	// Set by fnPassMega()
 	ObjectMega _engineMega;
 
@@ -133,6 +133,8 @@ public:
 
 	EventUnit *getEventList() { return _eventList; }
 
+	ObjectMega *getEngineMega() { return &_engineMega; }
+
 	// Point to the global variable data
 	static uint32 *_scriptVars;