diff options
| author | Max Horn | 2002-05-14 23:32:34 +0000 |
|---|---|---|
| committer | Max Horn | 2002-05-14 23:32:34 +0000 |
| commit | b529d80ed7c39f2aa9718adda2828db27bba5df0 (patch) | |
| tree | f92bba6ad134ff8837bad007e9dcbe2f9238a506 | |
| parent | 659bc0e69167f977e58d9ef3c3bbfb17907121fc (diff) | |
| download | scummvm-rg350-b529d80ed7c39f2aa9718adda2828db27bba5df0.tar.gz scummvm-rg350-b529d80ed7c39f2aa9718adda2828db27bba5df0.tar.bz2 scummvm-rg350-b529d80ed7c39f2aa9718adda2828db27bba5df0.zip | |
added #include "actor.h", some minor tweaks
svn-id: r4332
| -rw-r--r-- | akos.cpp | 1 | ||||
| -rw-r--r-- | boxes.cpp | 2 | ||||
| -rw-r--r-- | costume.cpp | 1 | ||||
| -rw-r--r-- | debug.cpp | 4 | ||||
| -rw-r--r-- | gfx.cpp | 1 | ||||
| -rw-r--r-- | object.cpp | 1 | ||||
| -rw-r--r-- | resource.cpp | 6 | ||||
| -rw-r--r-- | saveload.cpp | 1 | ||||
| -rw-r--r-- | script.cpp | 1 | ||||
| -rw-r--r-- | script_v1.cpp | 1 | ||||
| -rw-r--r-- | script_v2.cpp | 1 | ||||
| -rw-r--r-- | scummsys.h | 3 | ||||
| -rw-r--r-- | sound.cpp | 2 | ||||
| -rw-r--r-- | string.cpp | 1 |
14 files changed, 17 insertions, 9 deletions
@@ -21,6 +21,7 @@ */ #include "stdafx.h" #include "scumm.h" +#include "actor.h" bool Scumm::akos_hasManyDirections(Actor * a) { @@ -22,7 +22,7 @@ #include "stdafx.h" #include "scumm.h" -#include "math.h" +#include "actor.h" byte Scumm::getMaskFromBox(int box) { diff --git a/costume.cpp b/costume.cpp index 7584e2d8da..7b5d528ec6 100644 --- a/costume.cpp +++ b/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 }; @@ -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" @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm.h" #include "gui.h" +#include "actor.h" void Scumm::getGraphicsPerformance() { diff --git a/object.cpp b/object.cpp index 635db2da92..be1f948aca 100644 --- a/object.cpp +++ b/object.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm.h" +#include "actor.h" bool Scumm::getClass(int obj, int cls) { diff --git a/resource.cpp b/resource.cpp index 7aef5d4dfb..31927b0157 100644 --- a/resource.cpp +++ b/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; } diff --git a/saveload.cpp b/saveload.cpp index dc81eef57f..929d07393c 100644 --- a/saveload.cpp +++ b/saveload.cpp @@ -24,6 +24,7 @@ #include "scumm.h" #include "sound/mididrv.h" #include "sound/imuse.h" +#include "actor.h" struct SaveGameHeader { uint32 type; diff --git a/script.cpp b/script.cpp index 73819c66a2..642f608cba 100644 --- a/script.cpp +++ b/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) diff --git a/script_v1.cpp b/script_v1.cpp index 89ea6fad4e..70c35d2e13 100644 --- a/script_v1.cpp +++ b/script_v1.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm.h" +#include "actor.h" void Scumm::setupOpcodes() { diff --git a/script_v2.cpp b/script_v2.cpp index a6f1693517..d384796638 100644 --- a/script_v2.cpp +++ b/script_v2.cpp @@ -23,6 +23,7 @@ #include "stdafx.h" #include "scumm.h" +#include "actor.h" #include "sound/mididrv.h" #include "sound/imuse.h" diff --git a/scummsys.h b/scummsys.h index c8100ea0fd..92d7dbc70f 100644 --- a/scummsys.h +++ b/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" @@ -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, diff --git a/string.cpp b/string.cpp index 9f96d03464..68e55f9115 100644 --- a/string.cpp +++ b/string.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm.h" +#include "actor.h" int CharsetRenderer::getStringWidth(int arg, byte *text, int pos) { |