diff options
-rw-r--r-- | engines/startrek/events.cpp | 4 | ||||
-rw-r--r-- | engines/startrek/graphics.cpp | 2 | ||||
-rw-r--r-- | engines/startrek/module.mk | 1 | ||||
-rw-r--r-- | engines/startrek/startrek.cpp | 7 | ||||
-rw-r--r-- | engines/startrek/startrek.h | 4 |
5 files changed, 2 insertions, 16 deletions
diff --git a/engines/startrek/events.cpp b/engines/startrek/events.cpp index c425b09050..d8935bd432 100644 --- a/engines/startrek/events.cpp +++ b/engines/startrek/events.cpp @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "startrek/console.h" #include "startrek/startrek.h" namespace StarTrek { @@ -62,9 +61,6 @@ void StarTrekEngine::pollEvents(bool queueEvents) { break; case Common::EVENT_KEYDOWN: - if (event.kbd.keycode == Common::KEYCODE_d && (event.kbd.flags & Common::KBD_CTRL)) - _console->attach(); - if (queueEvents) { trekEvent.type = TREKEVENT_KEYDOWN; addEventToQueue(trekEvent); diff --git a/engines/startrek/graphics.cpp b/engines/startrek/graphics.cpp index c99d8866f1..5c6a1441b6 100644 --- a/engines/startrek/graphics.cpp +++ b/engines/startrek/graphics.cpp @@ -20,7 +20,6 @@ */ #include "startrek/common.h" -#include "startrek/console.h" #include "startrek/graphics.h" #include "common/algorithm.h" @@ -638,7 +637,6 @@ void Graphics::updateScreen() { _mouseWarpY = -1; } - //_vm->_console->onFrame(); _vm->_system->updateScreen(); _vm->_system->delayMillis(10); } diff --git a/engines/startrek/module.mk b/engines/startrek/module.mk index db2a3fbe74..0f82c852fc 100644 --- a/engines/startrek/module.mk +++ b/engines/startrek/module.mk @@ -5,7 +5,6 @@ MODULE_OBJS = \ awaymission.o \ bitmap.o \ common.o \ - console.o \ detection.o \ events.o \ filestream.o \ diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp index 12680c6fd3..6160f9caf3 100644 --- a/engines/startrek/startrek.cpp +++ b/engines/startrek/startrek.cpp @@ -37,7 +37,6 @@ #include "engines/util.h" #include "video/qt_decoder.h" -#include "startrek/console.h" #include "startrek/filestream.h" #include "startrek/iwfile.h" #include "startrek/lzss.h" @@ -108,18 +107,14 @@ StarTrekEngine::StarTrekEngine(OSystem *syst, const StarTrekGameDescription *gam StarTrekEngine::~StarTrekEngine() { delete _activeMenu->nextMenu; delete _activeMenu; - - delete _console; - delete _sound; delete _gfx; - + delete _sound; delete _macResFork; } Common::Error StarTrekEngine::run() { _gfx = new Graphics(this); _sound = new Sound(this); - _console = new Console(this); if (getPlatform() == Common::kPlatformMacintosh) { _macResFork = new Common::MacResManager(); diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h index a575aad26e..bfc8266e45 100644 --- a/engines/startrek/startrek.h +++ b/engines/startrek/startrek.h @@ -61,7 +61,6 @@ namespace StarTrek { class StarTrekEngine; class Room; -class Console; typedef String(StarTrekEngine::*TextGetterFunc)(int, uintptr, String *); @@ -777,15 +776,14 @@ public: Graphics *_gfx; Sound *_sound; - Console *_console; SharedPtr<IWFile> _iwFile; - SharedPtr<Room> _room; private: Common::RandomSource _randomSource; Common::SineTable _sineTable; Common::MacResManager *_macResFork; + SharedPtr<Room> _room; }; // Static function |