diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cruise/cruise.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/volume.cpp | 3 | ||||
-rw-r--r-- | engines/gob/demos/demoplayer.cpp | 2 | ||||
-rw-r--r-- | engines/gob/expression.cpp | 3 | ||||
-rw-r--r-- | engines/gob/hotspots.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/lol.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/resource.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/screen_lok.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/script.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/sound_towns.cpp | 2 | ||||
-rw-r--r-- | engines/lure/strings.cpp | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp index adfe3f102d..3496ec50bb 100644 --- a/engines/cruise/cruise.cpp +++ b/engines/cruise/cruise.cpp @@ -89,7 +89,7 @@ Common::Error CruiseEngine::run() { if (!loadLanguageStrings()) { error("Could not setup language data for your version"); - return Common::kUnknownError; + //return Common::kUnknownError; } initialize(); diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp index 2c998ea61d..b83be1d6ee 100644 --- a/engines/cruise/volume.cpp +++ b/engines/cruise/volume.cpp @@ -36,10 +36,9 @@ int16 fileData2; char currentBaseName[15] = ""; void loadPal(volumeDataStruct *entry) { - char name[20]; - // This code isn't currently being used #if 0 + char name[20]; if (PAL_file.isOpen()) PAL_file.close(); diff --git a/engines/gob/demos/demoplayer.cpp b/engines/gob/demos/demoplayer.cpp index bb56633525..da96aecaa6 100644 --- a/engines/gob/demos/demoplayer.cpp +++ b/engines/gob/demos/demoplayer.cpp @@ -103,8 +103,6 @@ bool DemoPlayer::play(uint32 index) { default: return false; } - - return false; } bool DemoPlayer::lineStartsWith(const Common::String &line, const char *start) { diff --git a/engines/gob/expression.cpp b/engines/gob/expression.cpp index 7e96a7d932..a3cf13ea85 100644 --- a/engines/gob/expression.cpp +++ b/engines/gob/expression.cpp @@ -204,13 +204,14 @@ void Expression::skipExpr(char stopToken) { void Expression::printExpr(char stopToken) { // Expression printing disabled by default - return; +#if 0 int32 savedPos = _vm->_game->_script->pos(); printExpr_internal(stopToken); // restore IP to start of expression _vm->_game->_script->seek(savedPos); +#endif } void Expression::printExpr_internal(char stopToken) { diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp index b9f5e4b2ca..a5be507517 100644 --- a/engines/gob/hotspots.cpp +++ b/engines/gob/hotspots.cpp @@ -263,7 +263,7 @@ uint16 Hotspots::add(const Hotspot &hotspot) { } error("Hotspots::add(): Hotspot array full"); - return 0xFFFF; + //return 0xFFFF; } void Hotspots::remove(uint16 id) { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 70bba25764..0c7d231edc 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -1309,7 +1309,7 @@ int LoLEngine::calculateCharacterStats(int charNum, int index) { return _characters[charNum].skillLevels[index] + _characters[charNum].skillModifiers[index]; } - return 1; + //return 1; } int LoLEngine::calculateProtection(int index) { diff --git a/engines/kyra/resource.cpp b/engines/kyra/resource.cpp index 112db7afdf..ab59108825 100644 --- a/engines/kyra/resource.cpp +++ b/engines/kyra/resource.cpp @@ -132,7 +132,7 @@ bool Resource::reset() { } } else { error("Unknown game id: %d", _vm->game()); - return false; + //return false; } return true; @@ -191,7 +191,7 @@ bool Resource::loadFileList(const Common::String &filedata) { } else if (!loadPakFile(filename)) { delete f; error("couldn't load file '%s'", filename.c_str()); - return false; + //return false; } } } @@ -207,7 +207,7 @@ bool Resource::loadFileList(const char * const *filelist, uint32 numFiles) { while (numFiles--) { if (!loadPakFile(filelist[numFiles])) { error("couldn't load file '%s'", filelist[numFiles]); - return false; + //return false; } } diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index ed7bef0178..de01eadccb 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -340,7 +340,7 @@ void Screen_LoK_16::getFadeParams(const Palette &pal, int delay, int &delayInc, int Screen_LoK_16::fadePalStep(const Palette &pal, int diff) { error("Screen_LoK_16::fadePalStep called"); - return 0; + //return 0; } void Screen_LoK_16::paletteMap(uint8 idx, int r, int g, int b) { diff --git a/engines/kyra/script.cpp b/engines/kyra/script.cpp index 726c013b5a..3b18bca40d 100644 --- a/engines/kyra/script.cpp +++ b/engines/kyra/script.cpp @@ -106,7 +106,7 @@ bool EMCInterpreter::load(const char *filename, EMCData *scriptData, const Commo Common::SeekableReadStream *stream = _vm->resource()->createReadStream(filename); if (!stream) { error("Couldn't open script file '%s'", filename); - return false; + //return false; } memset(scriptData, 0, sizeof(EMCData)); diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp index 5e02dff3f9..864d3fc15e 100644 --- a/engines/kyra/sound_towns.cpp +++ b/engines/kyra/sound_towns.cpp @@ -909,9 +909,11 @@ void Towns_EuphonyParser::parseNextEvent(EventInfo &info) { loop = false; } else { error("Unknown Euphony music event 0x%02X", (int)cmd); +#if 0 memset(&info, 0, sizeof(info)); pos = 0; loop = false; +#endif } } _position._play_pos = pos; diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp index 4f7d47d004..b7f179703b 100644 --- a/engines/lure/strings.cpp +++ b/engines/lure/strings.cpp @@ -178,7 +178,7 @@ char StringData::readCharacter() { error("Unknown bit sequence encountered when decoding string"); - return 0; + //return 0; } void StringData::getString(uint16 stringId, char *dest, const char *hotspotName, |