diff options
author | Torbjörn Andersson | 2010-09-18 10:55:16 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2010-09-18 10:55:16 +0000 |
commit | c91a07229a8bd841e6b6e77d977254c388a2e407 (patch) | |
tree | 8eb84ab7f181f42447e14f76f4bb06889a2df246 /engines | |
parent | 6fed6a75d53259f90b69ca951275e11d6c98042a (diff) | |
download | scummvm-rg350-c91a07229a8bd841e6b6e77d977254c388a2e407.tar.gz scummvm-rg350-c91a07229a8bd841e6b6e77d977254c388a2e407.tar.bz2 scummvm-rg350-c91a07229a8bd841e6b6e77d977254c388a2e407.zip |
JANITORIAL: Removed most punctuation at end of warning() and error()
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.
svn-id: r52791
Diffstat (limited to 'engines')
28 files changed, 32 insertions, 32 deletions
diff --git a/engines/agi/lzw.cpp b/engines/agi/lzw.cpp index 60bd8f4fca..f645cb16d3 100644 --- a/engines/agi/lzw.cpp +++ b/engines/agi/lzw.cpp @@ -107,7 +107,7 @@ uint8 *LZWDecoder::decodeString(uint8 *buffer, uint32 code) { *buffer++ = appendCharacter[code]; code = prefixCode[code]; if (i++ >= 4000) { - error("lzw: error in code expansion."); + error("lzw: error in code expansion"); } } *buffer = code; diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp index 153fec641a..820aad3883 100644 --- a/engines/agi/predictive.cpp +++ b/engines/agi/predictive.cpp @@ -518,7 +518,7 @@ void AgiEngine::loadDict() { _predictiveDictLine = (char **)calloc(1, sizeof(char *) * lines); if (_predictiveDictLine == NULL) { - warning("Cannot allocate memory for line index buffer."); + warning("Cannot allocate memory for line index buffer"); return; } _predictiveDictLine[0] = _predictiveDictText; diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 88b14dcfe2..386a6b1135 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -333,7 +333,7 @@ int AgiEngine::loadGame(const char *fileName, bool checkId) { debug(0, "Saved game MD5: \"%s\"", md5); if (!getGameMD5()) { - warning("Since your game was only detected via the fallback detector, there is no possibility to assure the save is compatible with your game version."); + warning("Since your game was only detected via the fallback detector, there is no possibility to assure the save is compatible with your game version"); debug(0, "The game used for saving is \"%s\".", md5); } else if (strcmp(md5, getGameMD5())) { diff --git a/engines/cine/part.cpp b/engines/cine/part.cpp index 95f3789abd..f5c9402388 100644 --- a/engines/cine/part.cpp +++ b/engines/cine/part.cpp @@ -164,7 +164,7 @@ void CineEngine::readVolCnf() { // All file name blocks' sizes were divisible by either 11 or 13, but not with both. fileNameLength = (fileNameLenMod11 ? 11 : 13); } else { - warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme."); + warning("Couldn't deduce file name length from data in 'vol.cnf', using a backup deduction scheme"); // Here we use the former file name length detection method // if we couldn't deduce the file name length from the data. fileNameLength = (compressed ? 11 : 13); diff --git a/engines/engine.cpp b/engines/engine.cpp index e2c0bb79f3..965dcca485 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -110,7 +110,7 @@ Engine::Engine(OSystem *syst) // heaps of (sound) memory get allocated but never freed. Of course, // there still would be problems with many games... if (!_mixer->isReady()) - warning("Sound initialization failed. This may cause severe problems in some games."); + warning("Sound initialization failed. This may cause severe problems in some games"); // Setup a dummy cursor and palette, so that all engines can use // CursorMan.replace without having any headaches about memory leaks. diff --git a/engines/gob/palanim.cpp b/engines/gob/palanim.cpp index f3770b0425..755d28c6e9 100644 --- a/engines/gob/palanim.cpp +++ b/engines/gob/palanim.cpp @@ -88,7 +88,7 @@ bool PalAnim::fadeStep(int16 oper) { if (oper == 0) { if (_vm->_global->_setAllPalette) { if (_vm->_global->_inVM != 0) - error("PalAnim::fadeStep(): _vm->_global->_inVM != 0 not supported."); + error("PalAnim::fadeStep(): _vm->_global->_inVM != 0 not supported"); for (int i = 0; i < 256; i++) { newRed = fadeColor(_vm->_global->_redPalette[i], _toFadeRed[i]); diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index 1c27716a67..4d0248b1e4 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -179,7 +179,7 @@ Common::Error KyraEngine_v1::init() { #ifdef ENABLE_LOL _flags.gameID = GI_LOL; #else - error("Lands of Lore demo is not supported in this build."); + error("Lands of Lore demo is not supported in this build"); #endif // !ENABLE_LOL } diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index b1cc954137..3ad7093046 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -137,7 +137,7 @@ Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filena kReadSaveHeaderError errorCode = KyraEngine_v1::readSaveHeader(in, false, header); if (errorCode != kRSHENoError) { if (errorCode == kRSHEInvalidType) - warning("No ScummVM Kyra engine savefile header."); + warning("No ScummVM Kyra engine savefile header"); else if (errorCode == kRSHEInvalidVersion) warning("Savegame is not the right version (%u, '%s')", header.version, header.oldHeader ? "true" : "false"); else if (errorCode == kRSHEIoError) diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index e09cc8123c..7ca3ae89d5 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -1084,7 +1084,7 @@ void Screen::setTextColor(const uint8 *cmap, int a, int b) { bool Screen::loadFont(FontId fontId, const char *filename) { if (fontId == FID_SJIS_FNT) { - warning("Trying to replace system SJIS font."); + warning("Trying to replace system SJIS font"); return true; } diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp index bce1824a09..a8cd643e2c 100644 --- a/engines/mohawk/myst_scripts.cpp +++ b/engines/mohawk/myst_scripts.cpp @@ -2455,7 +2455,7 @@ void MystScriptParser::opcode_120(uint16 op, uint16 var, uint16 argc, uint16 *ar if (var8 != 0xFFFF) _vm->_varStore->setVar(var8, !_vm->_varStore->getVar(var8)); else - warning("Opcode 120: No invoking Resource Var 8 found!"); + warning("Opcode 120: No invoking Resource Var 8 found"); } else unknown(op, var, argc, argv); break; diff --git a/engines/mohawk/riven_saveload.cpp b/engines/mohawk/riven_saveload.cpp index c055eb51a8..c63a3f98fb 100644 --- a/engines/mohawk/riven_saveload.cpp +++ b/engines/mohawk/riven_saveload.cpp @@ -110,7 +110,7 @@ bool RivenSaveLoad::loadGame(Common::String filename) { delete vers; if ((saveGameVersion == kCDSaveGameVersion && (_vm->getFeatures() & GF_DVD)) || (saveGameVersion == kDVDSaveGameVersion && !(_vm->getFeatures() & GF_DVD))) { - warning("Incompatible saved game versions. No support for this yet."); + warning("Incompatible saved game versions. No support for this yet"); delete mhk; return false; } diff --git a/engines/parallaction/gui_ns.cpp b/engines/parallaction/gui_ns.cpp index 562c806958..9f50236360 100644 --- a/engines/parallaction/gui_ns.cpp +++ b/engines/parallaction/gui_ns.cpp @@ -586,7 +586,7 @@ public: if (_points[2] >= _points[0] && _points[2] >= _points[1]) { character = CHAR_DOUGH; } else { - error("If you read this, either your CPU or transivity is broken (we believe the former)."); + error("If you read this, either your CPU or transivity is broken (we believe the former)"); } _vm->cleanupGame(); diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index ce7525345a..2de7fe9d64 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -201,7 +201,7 @@ void Parallaction::allocateLocationSlot(const char *name) { } if (_di == 120) - error("No more location slots available. Please report this immediately to ScummVM team."); + error("No more location slots available. Please report this immediately to ScummVM team"); if (_currentLocationIndex == -1) { strcpy(_locationNames[_numLocations], name); diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index 407dd86ec3..f1def31f9f 100644 --- a/engines/parallaction/sound_br.cpp +++ b/engines/parallaction/sound_br.cpp @@ -130,7 +130,7 @@ void MidiParser_MSC::parseMidiEvent(EventInfo &info) { break; default: - warning("Unexpected midi event 0x%02X in midi data.", info.event); + warning("Unexpected midi event 0x%02X in midi data", info.event); } //if ((type == 0xB) && (info.basic.param1 == 64)) info.basic.param2 = 127; @@ -173,7 +173,7 @@ bool MidiParser_MSC::loadMusic(byte *data, uint32 size) { byte *pos = data; if (memcmp("MSCt", pos, 4)) { - warning("Expected header not found in music file."); + warning("Expected header not found in music file"); return false; } pos += 4; diff --git a/engines/saga/font.cpp b/engines/saga/font.cpp index 5b7b7289eb..9589c68f90 100644 --- a/engines/saga/font.cpp +++ b/engines/saga/font.cpp @@ -123,7 +123,7 @@ void Font::loadFont(uint32 fontResourceId) { } if (readS.pos() != FONT_DESCSIZE) { - error("Invalid font resource size."); + error("Invalid font resource size"); } font->normal.font = (byte*)malloc(fontResourceLength - FONT_DESCSIZE); diff --git a/engines/saga/font.h b/engines/saga/font.h index d8b1da30b9..1b9f290a1b 100644 --- a/engines/saga/font.h +++ b/engines/saga/font.h @@ -186,7 +186,7 @@ class Font { void validate(FontId fontId) { if (!valid(fontId)) { - error("Font::validate: Invalid font id."); + error("Font::validate: Invalid font id"); } } bool valid(FontId fontId) { diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 94e53ed742..c26cd60a25 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -1102,7 +1102,7 @@ bool Console::cmdSaveGame(int argc, const char **argv) { } else { out->finalize(); if (out->err()) { - warning("Writing the savegame failed."); + warning("Writing the savegame failed"); } delete out; } diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 1944be3358..a4d1edf2ed 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -765,7 +765,7 @@ Common::Error SciEngine::saveGameState(int slot, const char *desc) { } else { out->finalize(); if (out->err()) { - warning("Writing the savegame failed."); + warning("Writing the savegame failed"); return Common::kWritingFailed; } delete out; diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp index 9347b33f5d..b6d67513d2 100644 --- a/engines/sci/engine/kfile.cpp +++ b/engines/sci/engine/kfile.cpp @@ -496,7 +496,7 @@ reg_t kCheckSaveGame(EngineState *s, int argc, reg_t *argv) { // Find saved-game if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END)) - error("kCheckSaveGame: called with invalid savegameId!"); + error("kCheckSaveGame: called with invalid savegameId"); uint savegameId = virtualId - SAVEGAMEID_OFFICIALRANGE_START; int savegameNr = findSavegame(saves, savegameId); if (savegameNr == -1) @@ -645,11 +645,11 @@ reg_t kSaveGame(EngineState *s, int argc, reg_t *argv) { warning("Error opening savegame \"%s\" for writing", filename.c_str()); } else { if (!gamestate_save(s, out, game_description.c_str(), version.c_str())) { - warning("Saving the game failed."); + warning("Saving the game failed"); } else { out->finalize(); if (out->err()) { - warning("Writing the savegame failed."); + warning("Writing the savegame failed"); } else { s->r_acc = TRUE_REG; // success } diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index ac6cfb6835..e97ae38702 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -117,7 +117,7 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { initGraphics(screenWidth, screenHeight, screenWidth > 320, NULL); if (g_system->getScreenFormat().bytesPerPixel == 1) { - error("This video requires >8bpp color to be displayed, but could not switch to RGB color mode."); + error("This video requires >8bpp color to be displayed, but could not switch to RGB color mode"); return NULL_REG; } diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp index 12ac1d2025..e7f319a25c 100644 --- a/engines/sci/graphics/ports.cpp +++ b/engines/sci/graphics/ports.cpp @@ -301,7 +301,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor Common::Rect r; if (!pwnd) { - error("Can't open window!"); + error("Can't open window"); return 0; } diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp index d690ecaad7..e6b8fd06c2 100644 --- a/engines/sci/resource_audio.cpp +++ b/engines/sci/resource_audio.cpp @@ -61,7 +61,7 @@ AudioVolumeResourceSource::AudioVolumeResourceSource(ResourceManager *resMan, co // Now read the whole offset mapping table for later usage int32 recordCount = fileStream->readUint32LE(); if (!recordCount) - error("compressed audio volume doesn't contain any entries!"); + error("compressed audio volume doesn't contain any entries"); int32 *offsetMapping = new int32[(recordCount + 1) * 2]; _audioCompressionOffsetMapping = offsetMapping; for (int recordNo = 0; recordNo < recordCount; recordNo++) { diff --git a/engines/scumm/he/wiz_he.cpp b/engines/scumm/he/wiz_he.cpp index 1ac7e98689..361a3bc165 100644 --- a/engines/scumm/he/wiz_he.cpp +++ b/engines/scumm/he/wiz_he.cpp @@ -2088,7 +2088,7 @@ void Wiz::displayWizComplexImage(const WizParameters *params) { if (_vm->_fullRedraw && dstResNum == 0) { if (sourceImage != 0 || (params->processFlags & (kWPFScaled | kWPFRotate))) - error("Can't do this command in the enter script."); + error("Can't do this command in the enter script"); assert(_imagesNum < ARRAYSIZE(_images)); WizImage *pwi = &_images[_imagesNum]; diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index c6ac53b862..e2b68f8d3b 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -714,7 +714,7 @@ void ScummEngine_v70he::storeFlObject(int slot) { memcpy(&_storedFlObjects[_numStoredFlObjects], &_objs[slot], sizeof(_objs[slot])); _numStoredFlObjects++; if (_numStoredFlObjects > 100) - error("Too many flobjects saved on room transition."); + error("Too many flobjects saved on room transition"); } void ScummEngine_v70he::restoreFlObjects() { diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 80df889a56..e5a5da4402 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1763,7 +1763,7 @@ void ScummEngine::setupMusic(int midi) { } else if (_game.platform == Common::kPlatformFMTowns && (_game.version == 3 || _game.id == GID_MONKEY)) { _musicEngine = _townsPlayer = new Player_Towns(this, _mixer); if (!_townsPlayer->init()) - error("Failed to initialize FM-Towns audio driver."); + error("Failed to initialize FM-Towns audio driver"); } else if (_game.version >= 3 && _game.heversion <= 62) { MidiDriver *nativeMidiDriver = 0; MidiDriver *adlibMidiDriver = 0; diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp index edf96f8e8c..30f67bf5ef 100644 --- a/engines/sky/sky.cpp +++ b/engines/sky/sky.cpp @@ -337,7 +337,7 @@ Common::Error SkyEngine::init() { } if (!_skyDisk->fileExists(60600 + SkyEngine::_systemVars.language * 8)) { - warning("The language you selected does not exist in your BASS version."); + warning("The language you selected does not exist in your BASS version"); if (_skyDisk->fileExists(60600)) SkyEngine::_systemVars.language = SKY_ENGLISH; // default to GB english if it exists.. else if (_skyDisk->fileExists(60600 + SKY_USA * 8)) diff --git a/engines/sword1/logic.cpp b/engines/sword1/logic.cpp index 35d8e14f27..ef54167d41 100644 --- a/engines/sword1/logic.cpp +++ b/engines/sword1/logic.cpp @@ -1017,7 +1017,7 @@ int Logic::fnNewScript(Object *cpt, int32 id, int32 script, int32 d, int32 e, in int Logic::fnSubScript(Object *cpt, int32 id, int32 script, int32 d, int32 e, int32 f, int32 z, int32 x) { cpt->o_tree.o_script_level++; if (cpt->o_tree.o_script_level == TOTAL_script_levels) - error("Compact %d: script level exceeded in fnSubScript.", id); + error("Compact %d: script level exceeded in fnSubScript", id); cpt->o_tree.o_script_pc[cpt->o_tree.o_script_level] = script; cpt->o_tree.o_script_id[cpt->o_tree.o_script_level] = script; return SCRIPT_STOP; @@ -1605,7 +1605,7 @@ int Logic::fnStopMusic(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d } int Logic::fnInnerSpace(Object *cpt, int32 id, int32 a, int32 b, int32 c, int32 d, int32 z, int32 x) { - error("fnInnerSpace() not working."); + error("fnInnerSpace() not working"); return SCRIPT_STOP; // for compilers that don't support NORETURN } diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index da9a83cdff..55600cfb63 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -535,7 +535,7 @@ void Sound::calcWaveVolume(int16 *data, uint32 length) { _waveVolPos = 0; for (uint32 blkCnt = 1; blkCnt < length / 918; blkCnt++) { if (blkCnt >= WAVE_VOL_TAB_LENGTH) { - warning("Wave vol tab too small."); + warning("Wave vol tab too small"); return; } int32 average = 0; |