Moved ObjectClass to object.h

svn-id: r17280

4 files changed, 11 insertions, 11 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 613567e868..4b1f3e447f 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -27,6 +27,7 @@
 #include "scumm/boxes.h"
 #include "scumm/charset.h"
 #include "scumm/costume.h"
+#include "scumm/object.h"
 #include "scumm/resource.h"
 #include "scumm/saveload.h"
 #include "scumm/sound.h"
diff --git a/scumm/gfx.h b/scumm/gfx.h
index 8f903c8724..172be4de20 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -202,7 +202,6 @@ struct StripTable;
 #define CHARSET_MASK_TRANSPARENCY	253
 
 class Gdi {
-//	friend class ScummEngine;	// Mostly for the code in saveload.cpp ...
 	ScummEngine *_vm;
 
 public:
diff --git a/scumm/object.h b/scumm/object.h
index 84014f4e6b..78cfc811ff 100644
--- a/scumm/object.h
+++ b/scumm/object.h
@@ -23,6 +23,16 @@
 
 namespace Scumm {
 
+enum ObjectClass {
+	kObjectClassNeverClip = 20,
+	kObjectClassAlwaysClip = 21,
+	kObjectClassIgnoreBoxes = 22,
+	kObjectClassYFlip = 29,
+	kObjectClassXFlip = 30,
+	kObjectClassPlayer = 31,	// Actor is controlled by the player
+	kObjectClassUntouchable = 32
+};
+
 struct ObjectData {
 	uint32 OBIMoffset;
 	uint32 OBCDoffset;
diff --git a/scumm/scumm.h b/scumm/scumm.h
index fafaa37c33..5fc23affd6 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -103,16 +103,6 @@ enum GameFeatures {
 	GF_EXTERNAL_CHARSET    = GF_SMALL_HEADER
 };
 
-enum ObjectClass {
-	kObjectClassNeverClip = 20,
-	kObjectClassAlwaysClip = 21,
-	kObjectClassIgnoreBoxes = 22,
-	kObjectClassYFlip = 29,
-	kObjectClassXFlip = 30,
-	kObjectClassPlayer = 31,	// Actor is controlled by the player
-	kObjectClassUntouchable = 32
-};
-
 /* SCUMM Debug Channels */
 void CDECL debugC(int level, const char *s, ...);