[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.598,1.599 intern.h,2.457,2.458

[Max Horn]

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

Modified Files:
	scumm.h intern.h 
Log Message:
Map is only needed in intern.h

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -d -r1.598 -r1.599
--- scumm.h	21 Apr 2005 03:29:30 -0000	1.598
+++ scumm.h	23 Apr 2005 16:09:21 -0000	1.599
@@ -25,7 +25,6 @@
 
 #include "base/engine.h"
 #include "common/file.h"
-#include "common/map.h"
 #include "common/rect.h"
 #include "common/str.h"
 
@@ -60,8 +59,6 @@
 struct FindObjectInRoom;
 struct ScummGameSettings;
 
-typedef Common::Map<Common::String, int> ObjectIDMap;
-
 // Use g_scumm from error() ONLY
 extern ScummEngine *g_scumm;
 

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.457
retrieving revision 2.458
diff -u -d -r2.457 -r2.458
--- intern.h	23 Apr 2005 01:50:42 -0000	2.457
+++ intern.h	23 Apr 2005 16:09:22 -0000	2.458
@@ -23,6 +23,8 @@
 #ifndef INTERN_H
 #define INTERN_H
 
+#include "common/map.h"
+
 #include "scumm/scumm.h"
 #include "scumm/wiz_he.h"
 
@@ -1262,6 +1264,8 @@
 	
 	const OpcodeEntryV8 *_opcodesV8;
 
+	typedef Common::Map<Common::String, int> ObjectIDMap;
+
 	ObjectIDMap _objectIDMap;
 
 public: