HUGO: Cleanup

Suppress almost all defines, rename constants

svn-id: r55451

1 files changed, 6 insertions, 2 deletions

diff --git a/engines/hugo/object.h b/engines/hugo/object.h
index 5e468ffcbb..1de2fb1621 100644
--- a/engines/hugo/object.h
+++ b/engines/hugo/object.h
@@ -35,8 +35,7 @@
 
 #include "common/file.h"
 
-#define MAXOBJECTS      128                         // Used in Update_images()
-#define BOUND(X, Y)     ((_vm->getBoundaryOverlay()[Y * XBYTES + X / 8] & (0x80 >> X % 8)) != 0)  // Boundary bit set
+#define BOUND(X, Y)     ((_vm->getBoundaryOverlay()[Y * kCompLineSize + X / 8] & (0x80 >> X % 8)) != 0)  // Boundary bit set
 
 namespace Hugo {
 
@@ -94,6 +93,11 @@ public:
 	}
 protected:
 	HugoEngine *_vm;
+
+	static const int kEdge = 10;                    // Closest object can get to edge of screen
+	static const int kEdge2 = kEdge * 2;            // Push object further back on edge collision
+	static const int kMaxObjNumb = 128;             // Used in Update_images()
+
 	uint16     _objCount;
 
 	void restoreSeq(object_t *obj);