ILLUSIONS: Rename file scriptman,* to scriptstack.* and remove unneccessary includes of it

18 files changed, 10 insertions, 52 deletions

diff --git a/engines/illusions/abortablethread.cpp b/engines/illusions/abortablethread.cpp
index 5f46ca8423..15c8f6c82b 100644
--- a/engines/illusions/abortablethread.cpp
+++ b/engines/illusions/abortablethread.cpp
@@ -23,7 +23,6 @@
 #include "illusions/illusions.h"
 #include "illusions/abortablethread.h"
 #include "illusions/input.h"
-#include "illusions/scriptman.h"
 #include "illusions/time.h"
 
 namespace Illusions {
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp
index e2b5e9194a..b524c02e5c 100644
--- a/engines/illusions/actor.cpp
+++ b/engines/illusions/actor.cpp
@@ -28,7 +28,6 @@
 #include "illusions/fixedpoint.h"
 #include "illusions/input.h"
 #include "illusions/screen.h"
-#include "illusions/scriptman.h"
 #include "illusions/scriptopcodes.h"
 #include "illusions/sequenceopcodes.h"
 #include "illusions/talkthread.h"
diff --git a/engines/illusions/bbdou/bbdou_inventory.cpp b/engines/illusions/bbdou/bbdou_inventory.cpp
index 3c4e37cc9b..5fdda628ca 100644
--- a/engines/illusions/bbdou/bbdou_inventory.cpp
+++ b/engines/illusions/bbdou/bbdou_inventory.cpp
@@ -28,7 +28,6 @@
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
-#include "illusions/scriptman.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/bbdou/bbdou_specialcode.cpp b/engines/illusions/bbdou/bbdou_specialcode.cpp
index eba37a8b88..5d98784219 100644
--- a/engines/illusions/bbdou/bbdou_specialcode.cpp
+++ b/engines/illusions/bbdou/bbdou_specialcode.cpp
@@ -29,7 +29,7 @@
 #include "illusions/camera.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
-#include "illusions/scriptman.h"
+#include "illusions/scriptstack.h"
 #include "illusions/scriptopcodes.h"
 
 namespace Illusions {
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index 993da5bad4..c51eb8707d 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -34,7 +34,6 @@
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptman.h"
 #include "illusions/sound.h"
 #include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
diff --git a/engines/illusions/illusions_bbdou.cpp b/engines/illusions/illusions_bbdou.cpp
index 41a6be6c8c..e98d0c1ff2 100644
--- a/engines/illusions/illusions_bbdou.cpp
+++ b/engines/illusions/illusions_bbdou.cpp
@@ -33,9 +33,9 @@
 #include "illusions/resourcesystem.h"
 #include "illusions/screen.h"
 #include "illusions/screentext.h"
+#include "illusions/scriptstack.h"
 #include "illusions/scriptopcodes_bbdou.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptman.h"
 #include "illusions/sound.h"
 #include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
@@ -205,7 +205,6 @@ Common::Error IllusionsEngine_BBDOU::run() {
 	_screen = new Screen(this, 640, 480, 16);
 	_screenText = new ScreenText(this);
 	_input = new Input();	
-	_scriptMan = new ScriptMan(this);
 	_actorItems = new ActorItems(this);
 	_backgroundItems = new BackgroundItems(this);
 	_camera = new Camera(this);
@@ -263,7 +262,6 @@ Common::Error IllusionsEngine_BBDOU::run() {
 	delete _camera;
 	delete _backgroundItems;
 	delete _actorItems;
-	delete _scriptMan;
 	delete _input;
 	delete _screenText;
 	delete _screen;
diff --git a/engines/illusions/illusions_duckman.cpp b/engines/illusions/illusions_duckman.cpp
index aee847e39f..5d845a40db 100644
--- a/engines/illusions/illusions_duckman.cpp
+++ b/engines/illusions/illusions_duckman.cpp
@@ -36,7 +36,7 @@
 #include "illusions/screentext.h"
 #include "illusions/scriptopcodes_duckman.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptman.h"
+#include "illusions/scriptstack.h"
 #include "illusions/sound.h"
 #include "illusions/soundresource.h"
 #include "illusions/specialcode.h"
diff --git a/engines/illusions/module.mk b/engines/illusions/module.mk
index 1bdec55592..ec52049239 100644
--- a/engines/illusions/module.mk
+++ b/engines/illusions/module.mk
@@ -26,7 +26,7 @@ MODULE_OBJS := \
 	resourcesystem.o \
 	screen.o \
 	screentext.o \
-	scriptman.o \
+	scriptstack.o \
 	scriptopcodes.o \
 	scriptopcodes_bbdou.o \
 	scriptopcodes_duckman.o \
diff --git a/engines/illusions/scriptopcodes_bbdou.cpp b/engines/illusions/scriptopcodes_bbdou.cpp
index 32350cd69e..e152c34074 100644
--- a/engines/illusions/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/scriptopcodes_bbdou.cpp
@@ -27,7 +27,7 @@
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
 #include "illusions/screen.h"
-#include "illusions/scriptman.h"
+#include "illusions/scriptstack.h"
 #include "illusions/scriptresource.h"
 #include "illusions/scriptthread.h"
 #include "illusions/sound.h"
diff --git a/engines/illusions/scriptopcodes_duckman.cpp b/engines/illusions/scriptopcodes_duckman.cpp
index 541ad18e11..8dd6af1155 100644
--- a/engines/illusions/scriptopcodes_duckman.cpp
+++ b/engines/illusions/scriptopcodes_duckman.cpp
@@ -27,7 +27,7 @@
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
 #include "illusions/screen.h"
-#include "illusions/scriptman.h"
+#include "illusions/scriptstack.h"
 #include "illusions/scriptresource.h"
 #include "illusions/scriptthread.h"
 #include "illusions/sound.h"
diff --git a/engines/illusions/scriptresource.cpp b/engines/illusions/scriptresource.cpp
index 18a258aa6c..71c8b89dc5 100644
--- a/engines/illusions/scriptresource.cpp
+++ b/engines/illusions/scriptresource.cpp
@@ -22,7 +22,6 @@
 
 #include "illusions/illusions.h"
 #include "illusions/scriptresource.h"
-#include "illusions/scriptman.h"
 
 namespace Illusions {
 
diff --git a/engines/illusions/scriptman.cpp b/engines/illusions/scriptstack.cpp
index ef4f462250..36cd3cb8e5 100644
--- a/engines/illusions/scriptman.cpp
+++ b/engines/illusions/scriptstack.cpp
@@ -21,10 +21,7 @@
  */
 
 #include "illusions/illusions.h"
-#include "illusions/scriptman.h"
-#include "illusions/actor.h"
-#include "illusions/camera.h"
-#include "illusions/scriptopcodes.h"
+#include "illusions/scriptstack.h"
 
 namespace Illusions {
 
@@ -67,13 +64,4 @@ int16 *ScriptStack::topPtr() {
 	return &_stack[_stackPos];
 }
 
-// ScriptMan
-
-ScriptMan::ScriptMan(IllusionsEngine_BBDOU *vm)
-	: _vm(vm) {
-}
-
-ScriptMan::~ScriptMan() {
-}
-
 } // End of namespace Illusions
diff --git a/engines/illusions/scriptman.h b/engines/illusions/scriptstack.h
index d296d807bd..b738102888 100644
--- a/engines/illusions/scriptman.h
+++ b/engines/illusions/scriptstack.h
@@ -20,19 +20,11 @@
  *
  */
 
-#ifndef ILLUSIONS_SCRIPTMAN_H
-#define ILLUSIONS_SCRIPTMAN_H
-
-#include "illusions/illusions_bbdou.h"
-#include "illusions/scriptresource.h"
-#include "illusions/thread.h"
-#include "common/algorithm.h"
-#include "common/stack.h"
+#ifndef ILLUSIONS_SCRIPTSTACK_H
+#define ILLUSIONS_SCRIPTSTACK_H
 
 namespace Illusions {
 
-class IllusionsEngine_BBDOU;
-
 class ScriptStack {
 public:
 	ScriptStack();
@@ -46,16 +38,6 @@ protected:
 	int16 _stack[256];
 };
 
-class ScriptMan {
-public:
-	ScriptMan(IllusionsEngine_BBDOU *vm);
-	~ScriptMan();
-public:
-
-	IllusionsEngine_BBDOU *_vm;
-	
-};
-
 } // End of namespace Illusions
 
-#endif // ILLUSIONS_SCRIPTMAN_H
+#endif // ILLUSIONS_SCRIPTSTACK_H
diff --git a/engines/illusions/scriptthread.cpp b/engines/illusions/scriptthread.cpp
index ba072e9407..a820289183 100644
--- a/engines/illusions/scriptthread.cpp
+++ b/engines/illusions/scriptthread.cpp
@@ -22,7 +22,6 @@
 
 #include "illusions/illusions.h"
 #include "illusions/scriptthread.h"
-#include "illusions/scriptman.h"
 #include "illusions/scriptopcodes.h"
 
 namespace Illusions {
diff --git a/engines/illusions/sequenceopcodes.cpp b/engines/illusions/sequenceopcodes.cpp
index 5ef5158951..ef76c782e6 100644
--- a/engines/illusions/sequenceopcodes.cpp
+++ b/engines/illusions/sequenceopcodes.cpp
@@ -26,7 +26,6 @@
 #include "illusions/actorresource.h"
 #include "illusions/dictionary.h"
 #include "illusions/screen.h"
-#include "illusions/scriptman.h"
 #include "illusions/scriptopcodes.h"
 #include "illusions/sound.h"
 
diff --git a/engines/illusions/talkthread.cpp b/engines/illusions/talkthread.cpp
index 783e9d2361..7d97588d8c 100644
--- a/engines/illusions/talkthread.cpp
+++ b/engines/illusions/talkthread.cpp
@@ -25,7 +25,6 @@
 #include "illusions/actor.h"
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
-#include "illusions/scriptman.h"
 #include "illusions/sound.h"
 #include "illusions/talkresource.h"
 #include "illusions/time.h"
diff --git a/engines/illusions/talkthread_duckman.cpp b/engines/illusions/talkthread_duckman.cpp
index 788126810b..6807c9869c 100644
--- a/engines/illusions/talkthread_duckman.cpp
+++ b/engines/illusions/talkthread_duckman.cpp
@@ -26,7 +26,6 @@
 #include "illusions/dictionary.h"
 #include "illusions/input.h"
 #include "illusions/screentext.h"
-#include "illusions/scriptman.h"
 #include "illusions/sound.h"
 #include "illusions/talkresource.h"
 #include "illusions/time.h"
diff --git a/engines/illusions/timerthread.cpp b/engines/illusions/timerthread.cpp
index 8cd5ea2e1c..95b30fec24 100644
--- a/engines/illusions/timerthread.cpp
+++ b/engines/illusions/timerthread.cpp
@@ -23,7 +23,6 @@
 #include "illusions/illusions.h"
 #include "illusions/timerthread.h"
 #include "illusions/input.h"
-#include "illusions/scriptman.h"
 #include "illusions/time.h"
 
 namespace Illusions {