diff options
-rw-r--r-- | engines/hugo/file.cpp | 18 | ||||
-rw-r--r-- | engines/hugo/file.h | 13 | ||||
-rw-r--r-- | engines/hugo/hugo.cpp | 15 | ||||
-rw-r--r-- | engines/hugo/hugo.h | 6 |
4 files changed, 10 insertions, 42 deletions
diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp index ebda0e9035..44dd287ed1 100644 --- a/engines/hugo/file.cpp +++ b/engines/hugo/file.cpp @@ -470,24 +470,6 @@ void FileManager::initSavedGame() { Utils::Error(WRITE_ERR, "%s", _vm->_initFilename.c_str()); } -void FileManager::openPlaybackFile(bool playbackFl, bool recordFl) { - debugC(1, kDebugFile, "openPlaybackFile(%d, %d)", (playbackFl) ? 1 : 0, (recordFl) ? 1 : 0); - -/* - if (playbackFl) { - if (!(fpb = fopen(PBFILE, "r+b"))) - Utils::Error(FILE_ERR, "%s", PBFILE); - } else if (recordFl) { - fpb = fopen(PBFILE, "wb"); - } -*/ - pbdata.time = 0; // Say no key available -} - -void FileManager::closePlaybackFile() { -// fclose(fpb); -} - void FileManager::printBootText() { // Read the encrypted text from the boot file and print it debugC(1, kDebugFile, "printBootText"); diff --git a/engines/hugo/file.h b/engines/hugo/file.h index 881cf3c4d7..47a5235ca8 100644 --- a/engines/hugo/file.h +++ b/engines/hugo/file.h @@ -47,12 +47,6 @@ struct PCC_header_t { // Structure of PCX file hea byte fill2[60]; }; // Header of a PCC file -// Record and playback handling stuff: -struct pbdata_t { -// int key; // Character - uint32 time; // Time at which character was pressed -}; - namespace Hugo { class FileManager { @@ -64,7 +58,6 @@ public: bool fileExists(char *filename); sound_pt getSound(short sound, uint16 *size); - void closePlaybackFile(); void initSavedGame(); void instructions(); void readBootFile(); @@ -95,14 +88,8 @@ private: byte *convertPCC(byte *p, uint16 y, uint16 bpl, image_pt data_p); uif_hdr_t *getUIFHeader(uif_t id); - pbdata_t pbdata; -// FILE *fpb; - //Strangerke : Not used? - void openPlaybackFile(bool playbackFl, bool recordFl); void printBootText(); -// bool pkkey(); -// char pbget(); }; class FileManager_v1d : public FileManager { diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index 2a4dd61487..1f06eec74b 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -287,6 +287,7 @@ Common::Error HugoEngine::run() { break; } } + _status.doQuitFl = shouldQuit(); // update game quit flag } return Common::kNoError; } @@ -1237,13 +1238,13 @@ bool HugoEngine::loadHugoDat() { } for (int varnt = 0; varnt < _numVariant; varnt++) { if (varnt == _gameVariant) { - _tunesNbr = in.readByte(); - _soundSilence = in.readByte(); - _soundTest = in.readByte(); + _tunesNbr = in.readSByte(); + _soundSilence = in.readSByte(); + _soundTest = in.readSByte(); } else { - in.readByte(); - in.readByte(); - in.readByte(); + in.readSByte(); + in.readSByte(); + in.readSByte(); } } @@ -1585,8 +1586,6 @@ void HugoEngine::shutdown() { debugC(1, kDebugEngine, "shutdown"); _file->closeDatabaseFiles(); - if (_status.recordFl || _status.playbackFl) - _file->closePlaybackFile(); _object->freeObjects(); } diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 0964029cab..766d1d9dfe 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -114,9 +114,9 @@ public: byte _gameVariant; byte _maxInvent; byte _numBonuses; - byte _soundSilence; - byte _soundTest; - byte _tunesNbr; + int8 _soundSilence; + int8 _soundTest; + int8 _tunesNbr; uint16 _numScreens; object_t *_hero; |