added #include "actor.h", some minor tweaks

svn-id: r4332

akos.cpp

@@ -21,6 +21,7 @@
  */
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 bool Scumm::akos_hasManyDirections(Actor * a)
 {

boxes.cpp

@@ -22,7 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
-#include "math.h"
+#include "actor.h"
 
 byte Scumm::getMaskFromBox(int box)
 {

costume.cpp

@@ -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 };
 

debug.cpp

@@ -23,11 +23,9 @@
  * Readline and command completion support by Tom Dunstan <tommyd@senet.com.au>
  */
 
-
-
-
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 #ifdef HAVE_READLINE
 #include "debugrl.h"

gfx.cpp

@@ -22,6 +22,7 @@
 #include "stdafx.h"
 #include "scumm.h"
 #include "gui.h"
+#include "actor.h"
 
 void Scumm::getGraphicsPerformance()
 {

object.cpp

@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 bool Scumm::getClass(int obj, int cls)
 {

resource.cpp

@@ -1235,11 +1235,11 @@ void Scumm::allocateArrays()
 
 
 
-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;
 }
 
 

saveload.cpp

@@ -24,6 +24,7 @@
 #include "scumm.h"
 #include "sound/mididrv.h"
 #include "sound/imuse.h"
+#include "actor.h"
 
 struct SaveGameHeader {
 	uint32 type;

script.cpp

@@ -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)

script_v1.cpp

@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 void Scumm::setupOpcodes()
 {

script_v2.cpp

@@ -23,6 +23,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 #include "sound/mididrv.h"
 #include "sound/imuse.h"

scummsys.h

@@ -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 @@ typedef signed long int32;
 #endif
 
 #elif defined(macintosh)
-#include <stdlib.h>
 #include <stdio.h>
 
 #include "macos.h"

sound.cpp

@@ -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,

string.cpp

@@ -22,6 +22,7 @@
 
 #include "stdafx.h"
 #include "scumm.h"
+#include "actor.h"
 
 int CharsetRenderer::getStringWidth(int arg, byte *text, int pos)
 {