From d292c0ec55024ef95833f56300987a19e2ef4e31 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 4 Apr 2006 22:04:51 +0000 Subject: Since our debug() adds an exclamation mark at the message end, remove it in several calls to avoid duplication!!11! svn-id: r21607 --- engines/kyra/sprites.cpp | 2 +- engines/queen/input.cpp | 2 +- engines/queen/music.cpp | 2 +- engines/queen/talk.cpp | 2 +- engines/scumm/gfx.cpp | 2 +- engines/scumm/imuse/imuse.cpp | 6 +++--- engines/sky/compact.cpp | 4 ++-- engines/sky/disk.cpp | 2 +- engines/sword2/logic.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'engines') diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 3d962d82c9..8e3b000367 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -461,7 +461,7 @@ void Sprites::loadDAT(const char *filename, SceneExits &exits) { data += 2; } _anims[nextAnim].length = data - animstart; - //debugC(1, kDebugLevelSprites, "Found an anim script of length %i!", _anims[nextAnim].length); + //debugC(1, kDebugLevelSprites, "Found an anim script of length %i", _anims[nextAnim].length); nextAnim++; data += 2; break; diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index c0b420df43..d6b4f4cb44 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -169,7 +169,7 @@ int Input::checkKeys() { case KEY_ESCAPE: // slip cutaway / dialogue if (_canQuit) { if (_cutawayRunning) { - debug(6, "[Input::checkKeys] Setting _cutawayQuit to true!"); + debug(6, "[Input::checkKeys] Setting _cutawayQuit to true"); _cutawayQuit = true; } if (_dialogueRunning) diff --git a/engines/queen/music.cpp b/engines/queen/music.cpp index c4a7a24503..bf7402e824 100644 --- a/engines/queen/music.cpp +++ b/engines/queen/music.cpp @@ -214,7 +214,7 @@ void MusicPlayer::queueTuneList(int16 tuneList) { void MusicPlayer::playMusic() { if (!_songQueue[0]) { - debug(5, "MusicPlayer::playMusic - Music queue is empty!"); + debug(5, "MusicPlayer::playMusic - Music queue is empty"); return; } diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp index b2485bef2a..223bd320f5 100644 --- a/engines/queen/talk.cpp +++ b/engines/queen/talk.cpp @@ -728,7 +728,7 @@ void Talk::defaultAnimation( _vm->bankMan()->overpack(head, startFrame, bankNum); } } else { - debug(6, "[Talk::defaultAnimation] Body action!"); + debug(6, "[Talk::defaultAnimation] Body action"); // Just do a body action _vm->bankMan()->overpack(parameters->body, startFrame, bankNum); } diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp index 53a0cbad96..018895d546 100644 --- a/engines/scumm/gfx.cpp +++ b/engines/scumm/gfx.cpp @@ -2183,7 +2183,7 @@ void Gdi::decodeNESGfx(const byte *room) { } _NES.hasmask = true; if (mask != 1) - debug(0,"NES room %i has irregular mask count %i!",_vm->_currentRoom,mask); + debug(0,"NES room %i has irregular mask count %i",_vm->_currentRoom,mask); int mwidth = *mdata++; for (i = 0; i < 16; i++) { n = 0; diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp index bab9d5dfdc..3645144a0a 100644 --- a/engines/scumm/imuse/imuse.cpp +++ b/engines/scumm/imuse/imuse.cpp @@ -79,7 +79,7 @@ byte *IMuseInternal::findStartOfSound(int sound) { ptr = _base_sounds[sound]; if (ptr == NULL) { - debug(1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist!", sound); + debug(1, "IMuseInternal::findStartOfSound(): Sound %d doesn't exist", sound); return NULL; } @@ -103,7 +103,7 @@ byte *IMuseInternal::findStartOfSound(int sound) { ++pos; // We could probably iterate more intelligently } - debug(3, "IMuseInternal::findStartOfSound(): Failed to align on sound %d!", sound); + debug(3, "IMuseInternal::findStartOfSound(): Failed to align on sound %d", sound); return 0; } @@ -578,7 +578,7 @@ bool IMuseInternal::startSound_internal (int sound) { void *ptr = findStartOfSound(sound); if (!ptr) { - debug(2, "IMuseInternal::startSound(): Couldn't find sound %d!", sound); + debug(2, "IMuseInternal::startSound(): Couldn't find sound %d", sound); return false; } diff --git a/engines/sky/compact.cpp b/engines/sky/compact.cpp index c629894ed3..9db5808fa1 100644 --- a/engines/sky/compact.cpp +++ b/engines/sky/compact.cpp @@ -428,7 +428,7 @@ uint16 SkyCompact::findCptId(void *cpt) { if (_compacts[listCnt][elemCnt] == cpt) return (listCnt << 12) | elemCnt; // not found - debug(1, "Id for Compact %p wasn't found!", cpt); + debug(1, "Id for Compact %p wasn't found", cpt); return 0; } @@ -439,7 +439,7 @@ uint16 SkyCompact::findCptId(const char *cptName) { if (scumm_stricmp(cptName, _cptNames[listCnt][elemCnt]) == 0) return (listCnt << 12) | elemCnt; // not found - debug(1, "Id for Compact %s wasn't found!", cptName); + debug(1, "Id for Compact %s wasn't found", cptName); return 0; } diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp index 451b4d9058..f92e5dc990 100644 --- a/engines/sky/disk.cpp +++ b/engines/sky/disk.cpp @@ -191,7 +191,7 @@ uint8 *Disk::getFileInfo(uint16 fileNr) { for (i = 0; i < _dinnerTableEntries; i++) { if (READ_LE_UINT16(dnrTbl16Ptr) == fileNr) { - debug(2, "file %d found!", fileNr); + debug(2, "file %d found", fileNr); return (uint8 *)dnrTbl16Ptr; } dnrTbl16Ptr += 4; diff --git a/engines/sword2/logic.cpp b/engines/sword2/logic.cpp index dcda724a65..194285836f 100644 --- a/engines/sword2/logic.cpp +++ b/engines/sword2/logic.cpp @@ -150,7 +150,7 @@ int Logic::processSession() { // Note that this really does happen a // lot, so don't make it a warning. - debug(5, "object %d script 0 terminated!", id); + debug(5, "object %d script 0 terminated", id); // reset to rerun, drop out for a cycle _curObjectHub.setScriptPc(level, _curObjectHub.getScriptId(level) & 0xffff); -- cgit v1.2.3