[Scummvm-cvs-logs] CVS: scummvm string.cpp,1.41,1.42 sound.cpp,1.88,1.89 object.cpp,1.68,1.69 resource.cpp,1.83,1.84 saveload.cpp,1.49,1.50 script.cpp,1.58,1.59 script_v1.cpp,1.112,1.113 script_v2.cpp,1.62,1.63 scummsys.h,1.36,1.37 akos.cpp,1.18,1.19 boxes.cpp,1.29,1.30 costume.cpp,1.31,1.32 debug.cpp,1.29,1.30 gfx.cpp,1.89,1.90

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10783

Modified Files:
	string.cpp sound.cpp object.cpp resource.cpp saveload.cpp 
	script.cpp script_v1.cpp script_v2.cpp scummsys.h akos.cpp 
	boxes.cpp costume.cpp debug.cpp gfx.cpp 
Log Message:
added #include "actor.h", some minor tweaks

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- string.cpp	14 May 2002 19:11:20 -0000	1.41
+++ string.cpp	14 May 2002 23:32:34 -0000	1.42
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 int CharsetRenderer::getStringWidth(int arg, byte *text, int pos)
 {

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- sound.cpp	14 May 2002 19:11:20 -0000	1.88
+++ sound.cpp	14 May 2002 23:32:34 -0000	1.89
@@ -24,7 +24,7 @@
 #include "scumm.h"
 #include "sound/mididrv.h"
 #include "sound/imuse.h"
-#include <sys/stat.h>
+#include "actor.h"
 
 #ifdef _WIN32_WCE
 extern void *bsearch(const void *, const void *, size_t,

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- object.cpp	14 May 2002 19:11:20 -0000	1.68
+++ object.cpp	14 May 2002 23:32:34 -0000	1.69
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 bool Scumm::getClass(int obj, int cls)
 {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- resource.cpp	14 May 2002 19:55:39 -0000	1.83
+++ resource.cpp	14 May 2002 23:32:34 -0000	1.84
@@ -1235,11 +1235,11 @@
 
 
 
-bool Scumm::isGlobInMemory(int type, int index)
+bool Scumm::isGlobInMemory(int type, int idx)
 {
-	validateResource("isGlobInMemory",type,index);
+	validateResource("isGlobInMemory",type,idx);
 
-	return res.address[type][index] != NULL;
+	return res.address[type][idx] != NULL;
 }
 
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- saveload.cpp	12 May 2002 21:58:35 -0000	1.49
+++ saveload.cpp	14 May 2002 23:32:34 -0000	1.50
@@ -24,6 +24,7 @@
 #include "scumm.h"
 #include "sound/mididrv.h"
 #include "sound/imuse.h"
+#include "actor.h"
 
 struct SaveGameHeader {
 	uint32 type;

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- script.cpp	14 May 2002 19:11:20 -0000	1.58
+++ script.cpp	14 May 2002 23:32:34 -0000	1.59
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 /* Start executing script 'script' with parameters 'a' and 'b' */
 void Scumm::runScript(int script, int a, int b, int16 * lvarptr)

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- script_v1.cpp	14 May 2002 20:07:08 -0000	1.112
+++ script_v1.cpp	14 May 2002 23:32:34 -0000	1.113
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 void Scumm::setupOpcodes()
 {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- script_v2.cpp	14 May 2002 19:11:20 -0000	1.62
+++ script_v2.cpp	14 May 2002 23:32:34 -0000	1.63
@@ -23,6 +23,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 #include "sound/mididrv.h"
 #include "sound/imuse.h"

Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- scummsys.h	9 May 2002 09:53:05 -0000	1.36
+++ scummsys.h	14 May 2002 23:32:34 -0000	1.37
@@ -21,6 +21,8 @@
 #ifndef __SCUMMSYS_H_
 #define __SCUMMSYS_H_
 
+#include <stdlib.h>
+
 #if defined(HAVE_NO_BOOL)
 typedef int bool;
 const bool true(1), false(0);
@@ -132,7 +134,6 @@
 #endif
 
 #elif defined(macintosh)
-#include <stdlib.h>
 #include <stdio.h>
 
 #include "macos.h"

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- akos.cpp	6 May 2002 15:32:32 -0000	1.18
+++ akos.cpp	14 May 2002 23:32:34 -0000	1.19
@@ -21,6 +21,7 @@
  */
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 bool Scumm::akos_hasManyDirections(Actor * a)
 {

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- boxes.cpp	14 May 2002 21:26:55 -0000	1.29
+++ boxes.cpp	14 May 2002 23:32:34 -0000	1.30
@@ -22,7 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "math.h"
+#include "actor.h"
 
 byte Scumm::getMaskFromBox(int box)
 {

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- costume.cpp	1 May 2002 19:03:54 -0000	1.31
+++ costume.cpp	14 May 2002 23:32:34 -0000	1.32
@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 const byte revBitMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
 

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/debug.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- debug.cpp	11 May 2002 19:17:58 -0000	1.29
+++ debug.cpp	14 May 2002 23:32:34 -0000	1.30
@@ -23,11 +23,9 @@
  * Readline and command completion support by Tom Dunstan <tommyd at senet.com.au>
  */
 
-
-
-
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 #ifdef HAVE_READLINE
 #include "debugrl.h"

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- gfx.cpp	14 May 2002 21:55:17 -0000	1.89
+++ gfx.cpp	14 May 2002 23:32:34 -0000	1.90
@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "gui.h"
+#include "actor.h"
 
 void Scumm::getGraphicsPerformance()
 {