diff options
| author | Filippos Karapetis | 2019-08-14 20:29:56 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-08-15 11:58:15 +0300 |
| commit | 384715da8448c303785072820329432461991deb (patch) | |
| tree | d0078ade12a8fb3096aa9afd87229dd0ad8bd5af /engines/startrek/startrek.cpp | |
| parent | 6761ef67cf71edc0e3a70e9279829d510e3a62f0 (diff) | |
| download | scummvm-rg350-384715da8448c303785072820329432461991deb.tar.gz scummvm-rg350-384715da8448c303785072820329432461991deb.tar.bz2 scummvm-rg350-384715da8448c303785072820329432461991deb.zip | |
STARTREK: Add a console
This also fixes an uninitialized pointer crash (_mapFile)
Diffstat (limited to 'engines/startrek/startrek.cpp')
| -rw-r--r-- | engines/startrek/startrek.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp index b01749525e..123fc74cf5 100644 --- a/engines/startrek/startrek.cpp +++ b/engines/startrek/startrek.cpp @@ -37,6 +37,7 @@ #include "engines/util.h" #include "video/qt_decoder.h" +#include "startrek/console.h" #include "startrek/iwfile.h" #include "startrek/lzss.h" #include "startrek/room.h" @@ -94,6 +95,7 @@ StarTrekEngine::StarTrekEngine(OSystem *syst, const StarTrekGameDescription *gam _missionToLoad = "DEMON"; _roomIndexToLoad = 0; + _mapFile = nullptr; _showSubtitles = true; Common::fill(_r3List, _r3List + NUM_SPACE_OBJECTS, (R3 *)nullptr); @@ -106,6 +108,8 @@ StarTrekEngine::StarTrekEngine(OSystem *syst, const StarTrekGameDescription *gam StarTrekEngine::~StarTrekEngine() { delete _activeMenu->nextMenu; delete _activeMenu; + + delete _console; delete _gfx; delete _sound; delete _macResFork; @@ -114,6 +118,7 @@ StarTrekEngine::~StarTrekEngine() { Common::Error StarTrekEngine::run() { _gfx = new Graphics(this); _sound = new Sound(this); + _console = new Console(this); if (getPlatform() == Common::kPlatformMacintosh) { _macResFork = new Common::MacResManager(); |