diff options
author | Torbjörn Andersson | 2009-05-31 10:02:16 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2009-05-31 10:02:16 +0000 |
commit | 0999534749f6c4edb9e4d054b95f185b829adba3 (patch) | |
tree | 55744aee72afd7cc699213a88be65938e70fa0a0 /engines/gob | |
parent | 3b311c65d0140e8bf727910d230ffd7a7f803761 (diff) | |
download | scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.gz scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.tar.bz2 scummvm-rg350-0999534749f6c4edb9e4d054b95f185b829adba3.zip |
The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)
svn-id: r41061
Diffstat (limited to 'engines/gob')
-rw-r--r-- | engines/gob/game.cpp | 2 | ||||
-rw-r--r-- | engines/gob/game_v1.cpp | 2 | ||||
-rw-r--r-- | engines/gob/game_v2.cpp | 2 | ||||
-rw-r--r-- | engines/gob/game_v6.cpp | 2 | ||||
-rw-r--r-- | engines/gob/gob.cpp | 2 | ||||
-rw-r--r-- | engines/gob/map.cpp | 2 | ||||
-rw-r--r-- | engines/gob/palanim.cpp | 2 | ||||
-rw-r--r-- | engines/gob/sound/adlib.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/engines/gob/game.cpp b/engines/gob/game.cpp index 1a3734ca88..d5c81098cc 100644 --- a/engines/gob/game.cpp +++ b/engines/gob/game.cpp @@ -230,7 +230,7 @@ void Game::capturePush(int16 left, int16 top, int16 width, int16 height) { int16 right; if (_captureCount == 20) - error("Game::capturePush(): Capture stack overflow!"); + error("Game::capturePush(): Capture stack overflow"); _captureStack[_captureCount].left = left; _captureStack[_captureCount].top = top; diff --git a/engines/gob/game_v1.cpp b/engines/gob/game_v1.cpp index f972bd3d0b..b46cc00f90 100644 --- a/engines/gob/game_v1.cpp +++ b/engines/gob/game_v1.cpp @@ -283,7 +283,7 @@ int16 Game_v1::addNewCollision(int16 id, uint16 left, uint16 top, return i; } - error("Game_v1::addNewCollision(): Collision array full!\n"); + error("Game_v1::addNewCollision(): Collision array full"); return 0; } diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp index 93540757b0..777eae14bc 100644 --- a/engines/gob/game_v2.cpp +++ b/engines/gob/game_v2.cpp @@ -341,7 +341,7 @@ int16 Game_v2::addNewCollision(int16 id, uint16 left, uint16 top, return i; } - error("Game_v2::addNewCollision(): Collision array full!\n"); + error("Game_v2::addNewCollision(): Collision array full"); return 0; } diff --git a/engines/gob/game_v6.cpp b/engines/gob/game_v6.cpp index 575e07798e..9d9bd1faa3 100644 --- a/engines/gob/game_v6.cpp +++ b/engines/gob/game_v6.cpp @@ -152,7 +152,7 @@ int16 Game_v6::addNewCollision(int16 id, uint16 left, uint16 top, return i; } - error("Game_v6::addNewCollision(): Collision array full!\n"); + error("Game_v6::addNewCollision(): Collision array full"); return 0; } diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp index ec8b0989a3..6f3d688aa1 100644 --- a/engines/gob/gob.cpp +++ b/engines/gob/gob.cpp @@ -136,7 +136,7 @@ void GobEngine::validateLanguage() { void GobEngine::validateVideoMode(int16 videoMode) { if ((videoMode != 0x10) && (videoMode != 0x13) && (videoMode != 0x14) && (videoMode != 0x18)) - error("Video mode 0x%X is not supported!", videoMode); + error("Video mode 0x%X is not supported", videoMode); } Endianness GobEngine::getEndianness() const { diff --git a/engines/gob/map.cpp b/engines/gob/map.cpp index bb259800c0..cd90ed87db 100644 --- a/engines/gob/map.cpp +++ b/engines/gob/map.cpp @@ -465,7 +465,7 @@ void Map::loadMapsInitGobs(void) { int16 layer; if (!_loadFromAvo) - error("Map::loadMapsInitGobs(): Loading .pas/.pos files is not supported!"); + error("Map::loadMapsInitGobs(): Loading .pas/.pos files is not supported"); for (int i = 0; i < 3; i++) _vm->_goblin->nextLayer(_vm->_goblin->_goblins[i]); diff --git a/engines/gob/palanim.cpp b/engines/gob/palanim.cpp index 564f7a1a9a..f3770b0425 100644 --- a/engines/gob/palanim.cpp +++ b/engines/gob/palanim.cpp @@ -83,7 +83,7 @@ bool PalAnim::fadeStep(int16 oper) { byte newBlue; if (_vm->_global->_colorCount != 256) - error("PalAnim::fadeStep(): Only 256 color mode is supported!"); + error("PalAnim::fadeStep(): Only 256 color mode is supported"); if (oper == 0) { if (_vm->_global->_setAllPalette) { diff --git a/engines/gob/sound/adlib.cpp b/engines/gob/sound/adlib.cpp index 90f7852b33..07481431b6 100644 --- a/engines/gob/sound/adlib.cpp +++ b/engines/gob/sound/adlib.cpp @@ -278,7 +278,7 @@ void AdLib::setKey(byte voice, byte note, bool on, bool spec) { writeOPL(0xB0 + voice, (freq >> 8) | (octa << 2) | 0x20 * on); if (!freq) - warning("Voice %d, note %02X unknown\n", voice, note); + warning("Voice %d, note %02X unknown", voice, note); } void AdLib::setVolume(byte voice, byte volume) { |