libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
johndoe123 2014-08-01 23:43:37 +02:00 committed by Eugene Sandulenko
parent 297996a090
commit 50d340de00
18 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/illusions/abortablethread.cpp
View File

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

1
engines/illusions/actor.cpp
View File

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

1
engines/illusions/bbdou/bbdou_inventory.cpp
View File

@ -28,7 +28,6 @@
#include "illusions/camera.h"
#include "illusions/dictionary.h"
#include "illusions/input.h"
#include "illusions/scriptman.h"
namespace Illusions {

2
engines/illusions/bbdou/bbdou_specialcode.cpp
View File

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

1
engines/illusions/illusions.cpp
View File

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

4
engines/illusions/illusions_bbdou.cpp
View File

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

2
engines/illusions/illusions_duckman.cpp
View File

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

2
engines/illusions/module.mk
View File

@ -26,7 +26,7 @@ MODULE_OBJS := \
resourcesystem.o \
screen.o \
screentext.o \
scriptman.o \
scriptstack.o \
scriptopcodes.o \
scriptopcodes_bbdou.o \
scriptopcodes_duckman.o \

2
engines/illusions/scriptopcodes_bbdou.cpp
View File

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

2
engines/illusions/scriptopcodes_duckman.cpp
View File

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

1
engines/illusions/scriptresource.cpp
View File

@ -22,7 +22,6 @@
#include "illusions/illusions.h"
#include "illusions/scriptresource.h"
#include "illusions/scriptman.h"
namespace Illusions {

14
engines/illusions/scriptman.cpp → engines/illusions/scriptstack.cpp
View File

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

24
engines/illusions/scriptman.h → engines/illusions/scriptstack.h
View File

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

1
engines/illusions/scriptthread.cpp
View File

@ -22,7 +22,6 @@
#include "illusions/illusions.h"
#include "illusions/scriptthread.h"
#include "illusions/scriptman.h"
#include "illusions/scriptopcodes.h"
namespace Illusions {

1
engines/illusions/sequenceopcodes.cpp
View File

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

1
engines/illusions/talkthread.cpp
View File

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

1
engines/illusions/talkthread_duckman.cpp
View File

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

1
engines/illusions/timerthread.cpp
View File

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