aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorDavid Symonds2007-01-16 13:09:42 +0000
committerDavid Symonds2007-01-16 13:09:42 +0000
commita2f49d31fbd06a2f6c58854970f9d7646504e195 (patch)
tree9e0a7f04028a785a66dbab2452ff54ff0062ae48 /engines/agi
parente315441cb89b9b6e384a2f60782e9a1e68ed2549 (diff)
downloadscummvm-rg350-a2f49d31fbd06a2f6c58854970f9d7646504e195.tar.gz
scummvm-rg350-a2f49d31fbd06a2f6c58854970f9d7646504e195.tar.bz2
scummvm-rg350-a2f49d31fbd06a2f6c58854970f9d7646504e195.zip
Remove #include "agi/text.h"; fixes build. Pointyhat to aquadran.
svn-id: r25103
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/agi.cpp3
-rw-r--r--engines/agi/console.cpp1
-rw-r--r--engines/agi/cycle.cpp1
-rw-r--r--engines/agi/inv.cpp2
-rw-r--r--engines/agi/keyboard.cpp1
-rw-r--r--engines/agi/menu.cpp1
-rw-r--r--engines/agi/op_cmd.cpp1
-rw-r--r--engines/agi/predictive.cpp1
-rw-r--r--engines/agi/savegame.cpp1
-rw-r--r--engines/agi/sprite.cpp1
-rw-r--r--engines/agi/text.cpp1
11 files changed, 1 insertions, 13 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp
index 14d4376434..17fc74db90 100644
--- a/engines/agi/agi.cpp
+++ b/engines/agi/agi.cpp
@@ -38,7 +38,6 @@
#include "sound/mixer.h"
#include "agi/agi.h"
-#include "agi/text.h"
#include "agi/graphics.h"
#include "agi/sprite.h"
#include "agi/opcodes.h"
@@ -263,7 +262,7 @@ void AgiEngine::releaseImageStack(void) {
free(_imageStack);
_imageStack = NULL;
_stackSize = 0;
- _imageStackPointer = NULL;
+ _imageStackPointer = 0;
}
void AgiEngine::recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
diff --git a/engines/agi/console.cpp b/engines/agi/console.cpp
index 5f1aaacd96..c459fa7e4d 100644
--- a/engines/agi/console.cpp
+++ b/engines/agi/console.cpp
@@ -27,7 +27,6 @@
#include "agi/agi.h"
#include "agi/graphics.h"
#include "agi/sprite.h"
-#include "agi/text.h"
#include "agi/keyboard.h"
#include "agi/opcodes.h"
#include "agi/console.h"
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index ff5b4baa58..9a7884640d 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -25,7 +25,6 @@
#include "common/stdafx.h"
#include "agi/agi.h"
-#include "agi/text.h"
#include "agi/sprite.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
diff --git a/engines/agi/inv.cpp b/engines/agi/inv.cpp
index c9c6772dc5..d5e3f5beb9 100644
--- a/engines/agi/inv.cpp
+++ b/engines/agi/inv.cpp
@@ -28,8 +28,6 @@
#include "agi/sprite.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
-#include "agi/text.h"
-#include "agi/keyboard.h"
namespace Agi {
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 198e777e2a..62a11e0b83 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -28,7 +28,6 @@
#include "agi/graphics.h"
#include "agi/keyboard.h"
#include "agi/menu.h"
-#include "agi/text.h" /* remove later */
namespace Agi {
diff --git a/engines/agi/menu.cpp b/engines/agi/menu.cpp
index 9a7e4703bb..6c0a407a35 100644
--- a/engines/agi/menu.cpp
+++ b/engines/agi/menu.cpp
@@ -29,7 +29,6 @@
#include "agi/graphics.h"
#include "agi/keyboard.h"
#include "agi/menu.h"
-#include "agi/text.h"
#include "common/list.h"
namespace Agi {
diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 11f20fa7b6..c3798bc4fb 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -31,7 +31,6 @@
#include "agi/keyboard.h"
#include "agi/opcodes.h"
#include "agi/menu.h"
-#include "agi/text.h"
namespace Agi {
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index e58d9a6695..0d14fbb55c 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -23,7 +23,6 @@
#include "agi/agi.h"
#include "agi/graphics.h"
#include "agi/keyboard.h"
-#include "agi/text.h"
#include "common/func.h"
diff --git a/engines/agi/savegame.cpp b/engines/agi/savegame.cpp
index b4c366c15d..010ad79fdf 100644
--- a/engines/agi/savegame.cpp
+++ b/engines/agi/savegame.cpp
@@ -33,7 +33,6 @@
#include "agi/agi.h"
#include "agi/graphics.h"
#include "agi/sprite.h"
-#include "agi/text.h"
#include "agi/keyboard.h"
#include "agi/menu.h"
diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp
index 2f0fbed9ee..8a67f2e60e 100644
--- a/engines/agi/sprite.cpp
+++ b/engines/agi/sprite.cpp
@@ -25,7 +25,6 @@
#include "agi/agi.h"
#include "agi/sprite.h"
#include "agi/graphics.h"
-#include "agi/text.h"
namespace Agi {
diff --git a/engines/agi/text.cpp b/engines/agi/text.cpp
index 735f58129c..70d7e25d58 100644
--- a/engines/agi/text.cpp
+++ b/engines/agi/text.cpp
@@ -26,7 +26,6 @@
#include "agi/sprite.h" /* for commit_both() */
#include "agi/graphics.h"
#include "agi/keyboard.h"
-#include "agi/text.h"
namespace Agi {