[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.332,1.333 gfx.h,1.114,1.115 object.h,1.16,1.17 scumm.h,1.552,1.553

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8869

Modified Files:
	actor.cpp gfx.h object.h scumm.h 
Log Message:
Moved ObjectClass to object.h

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -d -r1.332 -r1.333
--- actor.cpp	28 Mar 2005 20:34:17 -0000	1.332
+++ actor.cpp	28 Mar 2005 22:37:28 -0000	1.333
@@ -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"

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- gfx.h	28 Mar 2005 20:27:12 -0000	1.114
+++ gfx.h	28 Mar 2005 22:37:29 -0000	1.115
@@ -202,7 +202,6 @@
 #define CHARSET_MASK_TRANSPARENCY	253
 
 class Gdi {
-//	friend class ScummEngine;	// Mostly for the code in saveload.cpp ...
 	ScummEngine *_vm;
 
 public:

Index: object.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- object.h	1 Jan 2005 16:09:14 -0000	1.16
+++ object.h	28 Mar 2005 22:37:30 -0000	1.17
@@ -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;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -d -r1.552 -r1.553
--- scumm.h	28 Mar 2005 20:18:35 -0000	1.552
+++ scumm.h	28 Mar 2005 22:37:30 -0000	1.553
@@ -103,16 +103,6 @@
 	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, ...);