diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/hugo/display.cpp | 60 | ||||
-rw-r--r-- | engines/hugo/display.h | 15 | ||||
-rw-r--r-- | engines/hugo/file.cpp | 48 | ||||
-rw-r--r-- | engines/hugo/file.h | 24 | ||||
-rw-r--r-- | engines/hugo/hugo.cpp | 48 | ||||
-rw-r--r-- | engines/hugo/intro.cpp | 62 | ||||
-rw-r--r-- | engines/hugo/intro.h | 36 | ||||
-rw-r--r-- | engines/hugo/schedule.cpp | 12 | ||||
-rw-r--r-- | engines/hugo/schedule.h | 12 |
9 files changed, 163 insertions, 154 deletions
diff --git a/engines/hugo/display.cpp b/engines/hugo/display.cpp index f84e595e45..e825070e83 100644 --- a/engines/hugo/display.cpp +++ b/engines/hugo/display.cpp @@ -406,8 +406,32 @@ void Screen::shadowStr(int16 sx, int16 sy, char *s, byte color) { writeStr(sx, sy, s, color); } +void Screen::userHelp() { +// Introduce user to the game +// DOS versions Only + Utils::Box(BOX_ANY , "%s", + "F1 - Press F1 again\n" + " for instructions\n" + "F2 - Sound on/off\n" + "F3 - Recall last line\n" + "F4 - Save game\n" + "F5 - Restore game\n" + "F6 - Inventory\n" + "F8 - Turbo button\n" + "F9 - Boss button\n\n" + "ESC - Return to game"); +} + +Screen_v1d::Screen_v1d(HugoEngine &vm) : Screen(vm) { +} + +Screen_v1d::~Screen_v1d() { +} + // Load font file, construct font ptrs and reverse data bytes -void Screen::loadFont(int16 fontId) { +// TODO: This uses hardcoded fonts in hugo.dat, it should be replaced +// by a proper implementation of .FON files +void Screen_v1d::loadFont(int16 fontId) { byte height, width; static bool fontLoadedFl[NUM_FONTS] = {false, false, false}; @@ -419,9 +443,8 @@ void Screen::loadFont(int16 fontId) { return; fontLoadedFl[_fnt] = true; - _vm.file().readUIFItem(fontId, _fontdata[_fnt]); - // Compile font ptrs. Note: First ptr points to height,width of font + memcpy(_fontdata[_fnt], _vm._arrayFont[_fnt], _vm._arrayFontSize[_fnt]); _font[_fnt][0] = _fontdata[_fnt]; // Store height,width of fonts int16 offset = 2; // Start at fontdata[2] ([0],[1] used for height,width) @@ -440,32 +463,14 @@ void Screen::loadFont(int16 fontId) { } } -void Screen::userHelp() { -// Introduce user to the game -// DOS versions Only - Utils::Box(BOX_ANY , "%s", - "F1 - Press F1 again\n" - " for instructions\n" - "F2 - Sound on/off\n" - "F3 - Recall last line\n" - "F4 - Save game\n" - "F5 - Restore game\n" - "F6 - Inventory\n" - "F8 - Turbo button\n" - "F9 - Boss button\n\n" - "ESC - Return to game"); -} - -Screen_v2::Screen_v2(HugoEngine &vm) : Screen(vm) { +Screen_v1w::Screen_v1w(HugoEngine &vm) : Screen(vm) { } -Screen_v2::~Screen_v2() { +Screen_v1w::~Screen_v1w() { } // Load font file, construct font ptrs and reverse data bytes -// TODO: This uses hardcoded fonts in hugo.dat, it should be replaced -// by a proper implementation of .FON files -void Screen_v2::loadFont(int16 fontId) { +void Screen_v1w::loadFont(int16 fontId) { byte height, width; static bool fontLoadedFl[NUM_FONTS] = {false, false, false}; @@ -477,17 +482,15 @@ void Screen_v2::loadFont(int16 fontId) { return; fontLoadedFl[_fnt] = true; + _vm.file().readUIFItem(fontId, _fontdata[_fnt]); - memcpy(_fontdata[_fnt], _vm._arrayFont[_fnt], _vm._arrayFontSize[_fnt]); + // Compile font ptrs. Note: First ptr points to height,width of font _font[_fnt][0] = _fontdata[_fnt]; // Store height,width of fonts int16 offset = 2; // Start at fontdata[2] ([0],[1] used for height,width) // Setup the font array (127 characters) for (int i = 1; i < 128; i++) { - if (i == 127) - i = i; - _font[_fnt][i] = _fontdata[_fnt] + offset; height = *(_fontdata[_fnt] + offset); width = *(_fontdata[_fnt] + offset + 1); @@ -499,6 +502,5 @@ void Screen_v2::loadFont(int16 fontId) { offset += 2 + size; } } - } // End of namespace Hugo diff --git a/engines/hugo/display.h b/engines/hugo/display.h index c7586c5252..0985e1b9fd 100644 --- a/engines/hugo/display.h +++ b/engines/hugo/display.h @@ -50,7 +50,7 @@ public: void displayList(dupdate_t update, ...); void displayRect(int16 x, int16 y, int16 dx, int16 dy); void initDisplay(); - virtual void loadFont(int16 fontId); + virtual void loadFont(int16 fontId) = 0; void moveImage(image_pt srcImage, uint16 x1, uint16 y1, uint16 dx, uint16 dy, uint16 width1, image_pt dstImage, uint16 x2, uint16 y2, uint16 width2); void remapPal(uint16 oldIndex, uint16 newIndex); void restorePal(Common::SeekableReadStream *f); @@ -100,14 +100,21 @@ private: int16 center(char *s); }; -class Screen_v2 : public Screen { +class Screen_v1d : public Screen { public: - Screen_v2(HugoEngine &vm); - ~Screen_v2(); + Screen_v1d(HugoEngine &vm); + ~Screen_v1d(); virtual void loadFont(int16 fontId); }; +class Screen_v1w : public Screen { +public: + Screen_v1w(HugoEngine &vm); + ~Screen_v1w(); + + virtual void loadFont(int16 fontId); +}; } // End of namespace Hugo diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index 41eb3c88e4..8e0c817e76 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -745,21 +745,21 @@ void FileManager::instructions() { } -FileManager_v1::FileManager_v1(HugoEngine &vm) : FileManager(vm) { +FileManager_v1d::FileManager_v1d(HugoEngine &vm) : FileManager(vm) { } -FileManager_v1::~FileManager_v1() { +FileManager_v1d::~FileManager_v1d() { } -void FileManager_v1::openDatabaseFiles() { +void FileManager_v1d::openDatabaseFiles() { debugC(1, kDebugFile, "openDatabaseFiles"); } -void FileManager_v1::closeDatabaseFiles() { +void FileManager_v1d::closeDatabaseFiles() { debugC(1, kDebugFile, "closeDatabaseFiles"); } -void FileManager_v1::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { +void FileManager_v1d::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { // Open and read in an overlay file, close file uint32 i = 0; image_pt tmpImage = image; // temp ptr to overlay file @@ -784,7 +784,7 @@ void FileManager_v1::readOverlay(int screenNum, image_pt image, ovl_t overlayTyp _sceneryArchive1.close(); } -void FileManager_v1::readBackground(int screenIndex) { +void FileManager_v1d::readBackground(int screenIndex) { // Read a PCX image into dib_a seq_t seq; // Image sequence structure for Read_pcx @@ -804,13 +804,13 @@ void FileManager_v1::readBackground(int screenIndex) { _sceneryArchive1.close(); } -FileManager_v2::FileManager_v2(HugoEngine &vm) : FileManager(vm) { +FileManager_v2d::FileManager_v2d(HugoEngine &vm) : FileManager(vm) { } -FileManager_v2::~FileManager_v2() { +FileManager_v2d::~FileManager_v2d() { } -void FileManager_v2::openDatabaseFiles() { +void FileManager_v2d::openDatabaseFiles() { debugC(1, kDebugFile, "openDatabaseFiles"); if (!_stringArchive.open(STRING_FILE)) @@ -821,7 +821,7 @@ void FileManager_v2::openDatabaseFiles() { Utils::Error(FILE_ERR, "%s", OBJECTS_FILE); } -void FileManager_v2::closeDatabaseFiles() { +void FileManager_v2d::closeDatabaseFiles() { debugC(1, kDebugFile, "closeDatabaseFiles"); _stringArchive.close(); @@ -829,7 +829,7 @@ void FileManager_v2::closeDatabaseFiles() { _objectsArchive.close(); } -void FileManager_v2::readBackground(int screenIndex) { +void FileManager_v2d::readBackground(int screenIndex) { // Read a PCX image into dib_a seq_t seq; // Image sequence structure for Read_pcx sceneBlock_t sceneBlock; // Read a database header entry @@ -853,7 +853,7 @@ void FileManager_v2::readBackground(int screenIndex) { readPCX(_sceneryArchive1, &seq, _vm.screen().getFrontBuffer(), true, _vm._screenNames[screenIndex]); } -void FileManager_v2::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { +void FileManager_v2d::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { // Open and read in an overlay file, close file uint32 i = 0; int16 j, k; @@ -915,13 +915,13 @@ void FileManager_v2::readOverlay(int screenNum, image_pt image, ovl_t overlayTyp } while (k < OVL_SIZE); } -FileManager_v3::FileManager_v3(HugoEngine &vm) : FileManager(vm) { +FileManager_v1w::FileManager_v1w(HugoEngine &vm) : FileManager(vm) { } -FileManager_v3::~FileManager_v3() { +FileManager_v1w::~FileManager_v1w() { } -void FileManager_v3::openDatabaseFiles() { +void FileManager_v1w::openDatabaseFiles() { debugC(1, kDebugFile, "openDatabaseFiles"); if (!_stringArchive.open(STRING_FILE)) @@ -932,7 +932,7 @@ void FileManager_v3::openDatabaseFiles() { Utils::Error(FILE_ERR, "%s", OBJECTS_FILE); } -void FileManager_v3::closeDatabaseFiles() { +void FileManager_v1w::closeDatabaseFiles() { debugC(1, kDebugFile, "closeDatabaseFiles"); _stringArchive.close(); @@ -940,7 +940,7 @@ void FileManager_v3::closeDatabaseFiles() { _objectsArchive.close(); } -void FileManager_v3::readBackground(int screenIndex) { +void FileManager_v1w::readBackground(int screenIndex) { // Read a PCX image into dib_a seq_t seq; // Image sequence structure for Read_pcx sceneBlock_t sceneBlock; // Read a database header entry @@ -964,7 +964,7 @@ void FileManager_v3::readBackground(int screenIndex) { readPCX(_sceneryArchive1, &seq, _vm.screen().getFrontBuffer(), true, _vm._screenNames[screenIndex]); } -void FileManager_v3::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { +void FileManager_v1w::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { // Open and read in an overlay file, close file uint32 i = 0; image_pt tmpImage = image; // temp ptr to overlay file @@ -1009,13 +1009,13 @@ void FileManager_v3::readOverlay(int screenNum, image_pt image, ovl_t overlayTyp _sceneryArchive1.read(tmpImage, OVL_SIZE); } -FileManager_v4::FileManager_v4(HugoEngine &vm) : FileManager(vm) { +FileManager_v3d::FileManager_v3d(HugoEngine &vm) : FileManager(vm) { } -FileManager_v4::~FileManager_v4() { +FileManager_v3d::~FileManager_v3d() { } -void FileManager_v4::readBackground(int screenIndex) { +void FileManager_v3d::readBackground(int screenIndex) { // Read a PCX image into dib_a seq_t seq; // Image sequence structure for Read_pcx sceneBlock_t sceneBlock; // Read a database header entry @@ -1047,7 +1047,7 @@ void FileManager_v4::readBackground(int screenIndex) { } } -void FileManager_v4::openDatabaseFiles() { +void FileManager_v3d::openDatabaseFiles() { debugC(1, kDebugFile, "openDatabaseFiles"); if (!_stringArchive.open(STRING_FILE)) @@ -1060,7 +1060,7 @@ void FileManager_v4::openDatabaseFiles() { Utils::Error(FILE_ERR, "%s", OBJECTS_FILE); } -void FileManager_v4::closeDatabaseFiles() { +void FileManager_v3d::closeDatabaseFiles() { debugC(1, kDebugFile, "closeDatabaseFiles"); _stringArchive.close(); @@ -1069,7 +1069,7 @@ void FileManager_v4::closeDatabaseFiles() { _objectsArchive.close(); } -void FileManager_v4::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { +void FileManager_v3d::readOverlay(int screenNum, image_pt image, ovl_t overlayType) { // Open and read in an overlay file, close file uint32 i = 0; int16 j, k; diff --git a/engines/hugo/file.h b/engines/hugo/file.h index 71bd0bf75c..446be0aa70 100644 --- a/engines/hugo/file.h +++ b/engines/hugo/file.h @@ -86,10 +86,10 @@ private: // char pbget(); }; -class FileManager_v1 : public FileManager { +class FileManager_v1d : public FileManager { public: - FileManager_v1(HugoEngine &vm); - ~FileManager_v1(); + FileManager_v1d(HugoEngine &vm); + ~FileManager_v1d(); void openDatabaseFiles(); void closeDatabaseFiles(); @@ -97,10 +97,10 @@ public: void readOverlay(int screenNum, image_pt image, ovl_t overlayType); }; -class FileManager_v2 : public FileManager { +class FileManager_v2d : public FileManager { public: - FileManager_v2(HugoEngine &vm); - ~FileManager_v2(); + FileManager_v2d(HugoEngine &vm); + ~FileManager_v2d(); void openDatabaseFiles(); void closeDatabaseFiles(); @@ -108,10 +108,10 @@ public: void readOverlay(int screenNum, image_pt image, ovl_t overlayType); }; -class FileManager_v3 : public FileManager { +class FileManager_v1w : public FileManager { public: - FileManager_v3(HugoEngine &vm); - ~FileManager_v3(); + FileManager_v1w(HugoEngine &vm); + ~FileManager_v1w(); void openDatabaseFiles(); void closeDatabaseFiles(); @@ -119,10 +119,10 @@ public: void readOverlay(int screenNum, image_pt image, ovl_t overlayType); }; -class FileManager_v4 : public FileManager { +class FileManager_v3d : public FileManager { public: - FileManager_v4(HugoEngine &vm); - ~FileManager_v4(); + FileManager_v3d(HugoEngine &vm); + ~FileManager_v3d(); void openDatabaseFiles(); void closeDatabaseFiles(); diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 6254488fbe..8dc1ada4d5 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -157,40 +157,40 @@ Common::Error HugoEngine::run() { switch (_gameVariant) { case 0: // H1 Win - _fileManager = new FileManager_v3(*this); - _scheduler = new Scheduler_v2(*this); - _introHandler = new intro_1w(*this); - _screen = new Screen(*this); + _fileManager = new FileManager_v1w(*this); + _scheduler = new Scheduler_v3d(*this); + _introHandler = new intro_v1w(*this); + _screen = new Screen_v1w(*this); break; case 1: - _fileManager = new FileManager_v2(*this); - _scheduler = new Scheduler_v2(*this); - _introHandler = new intro_2w(*this); - _screen = new Screen(*this); + _fileManager = new FileManager_v2d(*this); + _scheduler = new Scheduler_v3d(*this); + _introHandler = new intro_v2w(*this); + _screen = new Screen_v1w(*this); break; case 2: - _fileManager = new FileManager_v2(*this); - _scheduler = new Scheduler_v2(*this); - _introHandler = new intro_3w(*this); - _screen = new Screen(*this); + _fileManager = new FileManager_v2d(*this); + _scheduler = new Scheduler_v3d(*this); + _introHandler = new intro_v3w(*this); + _screen = new Screen_v1w(*this); break; case 3: // H1 DOS - _fileManager = new FileManager_v1(*this); - _scheduler = new Scheduler_v1(*this); - _introHandler = new intro_1d(*this); - _screen = new Screen_v2(*this); + _fileManager = new FileManager_v1d(*this); + _scheduler = new Scheduler_v1d(*this); + _introHandler = new intro_v1d(*this); + _screen = new Screen_v1d(*this); break; case 4: - _fileManager = new FileManager_v2(*this); - _scheduler = new Scheduler_v1(*this); - _introHandler = new intro_2d(*this); - _screen = new Screen_v2(*this); + _fileManager = new FileManager_v2d(*this); + _scheduler = new Scheduler_v1d(*this); + _introHandler = new intro_v2d(*this); + _screen = new Screen_v1d(*this); break; case 5: - _fileManager = new FileManager_v4(*this); - _scheduler = new Scheduler_v2(*this); - _introHandler = new intro_3d(*this); - _screen = new Screen_v2(*this); + _fileManager = new FileManager_v3d(*this); + _scheduler = new Scheduler_v3d(*this); + _introHandler = new intro_v3d(*this); + _screen = new Screen_v1d(*this); break; } diff --git a/engines/hugo/intro.cpp b/engines/hugo/intro.cpp index c2198d87bc..c856985f47 100644 --- a/engines/hugo/intro.cpp +++ b/engines/hugo/intro.cpp @@ -48,51 +48,51 @@ IntroHandler::IntroHandler(HugoEngine &vm) : _vm(vm) { IntroHandler::~IntroHandler() { } -intro_1w::intro_1w(HugoEngine &vm) : IntroHandler(vm) { +intro_v1w::intro_v1w(HugoEngine &vm) : IntroHandler(vm) { } -intro_1w::~intro_1w() { +intro_v1w::~intro_v1w() { } -void intro_1w::preNewGame() { +void intro_v1w::preNewGame() { // Auto-start a new game _vm.file().restoreGame(-1); _vm.getGameStatus().viewState = V_INTROINIT; } -void intro_1w::introInit() { +void intro_v1w::introInit() { } -bool intro_1w::introPlay() { +bool intro_v1w::introPlay() { return true; } -intro_2w::intro_2w(HugoEngine &vm) : IntroHandler(vm) { +intro_v2w::intro_v2w(HugoEngine &vm) : IntroHandler(vm) { } -intro_2w::~intro_2w() { +intro_v2w::~intro_v2w() { } -void intro_2w::preNewGame() { +void intro_v2w::preNewGame() { } -void intro_2w::introInit() { +void intro_v2w::introInit() { } -bool intro_2w::introPlay() { +bool intro_v2w::introPlay() { return true; } -intro_3w::intro_3w(HugoEngine &vm) : IntroHandler(vm) { +intro_v3w::intro_v3w(HugoEngine &vm) : IntroHandler(vm) { } -intro_3w::~intro_3w() { +intro_v3w::~intro_v3w() { } -void intro_3w::preNewGame() { +void intro_v3w::preNewGame() { } -void intro_3w::introInit() { +void intro_v3w::introInit() { // Hugo 3 - show map and set up for introPlay() //#if STORY _vm.file().readBackground(22); // display screen MAP_3w @@ -101,7 +101,7 @@ void intro_3w::introInit() { //#endif } -bool intro_3w::introPlay() { +bool intro_v3w::introPlay() { byte introSize = _vm.getIntroSize(); // Hugo 3 - Preamble screen before going into game. Draws path of Hugo's plane. @@ -133,53 +133,53 @@ bool intro_3w::introPlay() { //#endif //STORY } -intro_1d::intro_1d(HugoEngine &vm) : IntroHandler(_vm) { +intro_v1d::intro_v1d(HugoEngine &vm) : IntroHandler(_vm) { } -intro_1d::~intro_1d() { +intro_v1d::~intro_v1d() { } -void intro_1d::preNewGame() { +void intro_v1d::preNewGame() { } -void intro_1d::introInit() { +void intro_v1d::introInit() { } -bool intro_1d::introPlay() { - warning("STUB: intro_1d::introPlay()"); +bool intro_v1d::introPlay() { + warning("STUB: intro_v1d::introPlay()"); return true; } //TODO : Add code for intro H2 DOS -intro_2d::intro_2d(HugoEngine &vm) : IntroHandler(_vm) { +intro_v2d::intro_v2d(HugoEngine &vm) : IntroHandler(_vm) { } -intro_2d::~intro_2d() { +intro_v2d::~intro_v2d() { } -void intro_2d::preNewGame() { +void intro_v2d::preNewGame() { } -void intro_2d::introInit() { +void intro_v2d::introInit() { } -bool intro_2d::introPlay() { +bool intro_v2d::introPlay() { return true; } //TODO : Add code for intro H3 DOS -intro_3d::intro_3d(HugoEngine &vm) : IntroHandler(_vm) { +intro_v3d::intro_v3d(HugoEngine &vm) : IntroHandler(_vm) { } -intro_3d::~intro_3d() { +intro_v3d::~intro_v3d() { } -void intro_3d::preNewGame() { +void intro_v3d::preNewGame() { } -void intro_3d::introInit() { +void intro_v3d::introInit() { } -bool intro_3d::introPlay() { +bool intro_v3d::introPlay() { return true; } diff --git a/engines/hugo/intro.h b/engines/hugo/intro.h index 555ae4326a..f8f1f95514 100644 --- a/engines/hugo/intro.h +++ b/engines/hugo/intro.h @@ -55,60 +55,60 @@ protected: int16 introTicks; // Count calls to introPlay() }; -class intro_1w : public IntroHandler { +class intro_v1w : public IntroHandler { public: - intro_1w(HugoEngine &vm); - ~intro_1w(); + intro_v1w(HugoEngine &vm); + ~intro_v1w(); void preNewGame(); void introInit(); bool introPlay(); }; -class intro_1d : public IntroHandler { +class intro_v1d : public IntroHandler { public: - intro_1d(HugoEngine &vm); - ~intro_1d(); + intro_v1d(HugoEngine &vm); + ~intro_v1d(); void preNewGame(); void introInit(); bool introPlay(); }; -class intro_2w : public IntroHandler { +class intro_v2w : public IntroHandler { public: - intro_2w(HugoEngine &vm); - ~intro_2w(); + intro_v2w(HugoEngine &vm); + ~intro_v2w(); void preNewGame(); void introInit(); bool introPlay(); }; -class intro_2d : public IntroHandler { +class intro_v2d : public IntroHandler { public: - intro_2d(HugoEngine &vm); - ~intro_2d(); + intro_v2d(HugoEngine &vm); + ~intro_v2d(); void preNewGame(); void introInit(); bool introPlay(); }; -class intro_3w : public IntroHandler { +class intro_v3w : public IntroHandler { public: - intro_3w(HugoEngine &vm); - ~intro_3w(); + intro_v3w(HugoEngine &vm); + ~intro_v3w(); void preNewGame(); void introInit(); bool introPlay(); }; -class intro_3d : public IntroHandler { +class intro_v3d : public IntroHandler { public: - intro_3d(HugoEngine &vm); - ~intro_3d(); + intro_v3d(HugoEngine &vm); + ~intro_v3d(); void preNewGame(); void introInit(); diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp index 41d194120f..3d20cbd7ad 100644 --- a/engines/hugo/schedule.cpp +++ b/engines/hugo/schedule.cpp @@ -678,23 +678,23 @@ void Scheduler::swapImages(int objNumb1, int objNumb2) { _vm._objects[objNumb1].y += _vm._objects[objNumb2].currImagePtr->y2 - _vm._objects[objNumb1].currImagePtr->y2; } -Scheduler_v1::Scheduler_v1(HugoEngine &vm) : Scheduler(vm) { +Scheduler_v1d::Scheduler_v1d(HugoEngine &vm) : Scheduler(vm) { } -Scheduler_v1::~Scheduler_v1() { +Scheduler_v1d::~Scheduler_v1d() { } -const char *Scheduler_v1::getCypher() { +const char *Scheduler_v1d::getCypher() { return "Copyright 1991, Gray Design Associates"; } -Scheduler_v2::Scheduler_v2(HugoEngine &vm) : Scheduler(vm) { +Scheduler_v3d::Scheduler_v3d(HugoEngine &vm) : Scheduler(vm) { } -Scheduler_v2::~Scheduler_v2() { +Scheduler_v3d::~Scheduler_v3d() { } -const char *Scheduler_v2::getCypher() { +const char *Scheduler_v3d::getCypher() { return "Copyright 1992, Gray Design Associates"; } } // End of namespace Hugo diff --git a/engines/hugo/schedule.h b/engines/hugo/schedule.h index 285f7bd663..efece354be 100644 --- a/engines/hugo/schedule.h +++ b/engines/hugo/schedule.h @@ -84,18 +84,18 @@ private: virtual const char *getCypher() = 0; }; -class Scheduler_v1 : public Scheduler { +class Scheduler_v1d : public Scheduler { public: - Scheduler_v1(HugoEngine &vm); - ~Scheduler_v1(); + Scheduler_v1d(HugoEngine &vm); + ~Scheduler_v1d(); const char *getCypher(); }; -class Scheduler_v2 : public Scheduler { +class Scheduler_v3d : public Scheduler { public: - Scheduler_v2(HugoEngine &vm); - ~Scheduler_v2(); + Scheduler_v3d(HugoEngine &vm); + ~Scheduler_v3d(); const char *getCypher(); }; |