[Scummvm-cvs-logs] SF.net SVN: scummvm: [21607] scummvm/trunk/engines/sky

[sev at users.sourceforge.net]

Revision: 21607
Author:   sev
Date:     2006-04-04 15:04:51 -0700 (Tue, 04 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21607&view=rev

Log Message:
-----------
Since our debug() adds an exclamation mark at the message end, remove
it in several calls to avoid duplication!!11!

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sprites.cpp
    scummvm/trunk/engines/queen/input.cpp
    scummvm/trunk/engines/queen/music.cpp
    scummvm/trunk/engines/queen/talk.cpp
    scummvm/trunk/engines/scumm/gfx.cpp
    scummvm/trunk/engines/scumm/imuse/imuse.cpp
    scummvm/trunk/engines/sky/compact.cpp
    scummvm/trunk/engines/sky/disk.cpp
    scummvm/trunk/engines/sword2/logic.cpp
    scummvm/trunk/sound/softsynth/mt32.cpp
Modified: scummvm/trunk/engines/kyra/sprites.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/kyra/sprites.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -461,7 +461,7 @@
 					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;

Modified: scummvm/trunk/engines/queen/input.cpp
===================================================================
--- scummvm/trunk/engines/queen/input.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/queen/input.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -169,7 +169,7 @@
 	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)

Modified: scummvm/trunk/engines/queen/music.cpp
===================================================================
--- scummvm/trunk/engines/queen/music.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/queen/music.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -214,7 +214,7 @@
 
 void MusicPlayer::playMusic() {
 	if (!_songQueue[0]) {
-		debug(5, "MusicPlayer::playMusic - Music queue is empty!");
+		debug(5, "MusicPlayer::playMusic - Music queue is empty");
 		return;
 	}
 

Modified: scummvm/trunk/engines/queen/talk.cpp
===================================================================
--- scummvm/trunk/engines/queen/talk.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/queen/talk.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -728,7 +728,7 @@
 						_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);
 				}

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -2183,7 +2183,7 @@
 	}
 	_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;

Modified: scummvm/trunk/engines/scumm/imuse/imuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/scumm/imuse/imuse.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -79,7 +79,7 @@
 		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 @@
 		++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 @@
 
 	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;
 	}
 

Modified: scummvm/trunk/engines/sky/compact.cpp
===================================================================
--- scummvm/trunk/engines/sky/compact.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/sky/compact.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -428,7 +428,7 @@
 			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 @@
 				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;
 }
 

Modified: scummvm/trunk/engines/sky/disk.cpp
===================================================================
--- scummvm/trunk/engines/sky/disk.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/sky/disk.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -191,7 +191,7 @@
 
 	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;

Modified: scummvm/trunk/engines/sword2/logic.cpp
===================================================================
--- scummvm/trunk/engines/sword2/logic.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/engines/sword2/logic.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -150,7 +150,7 @@
 					// 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);

Modified: scummvm/trunk/sound/softsynth/mt32.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32.cpp	2006-04-04 22:00:16 UTC (rev 21606)
+++ scummvm/trunk/sound/softsynth/mt32.cpp	2006-04-04 22:04:51 UTC (rev 21607)
@@ -207,7 +207,7 @@
 		debug(1, "MT32emu: 3DNow! is avaliable");
 		break;
 	case MT32Emu::ReportType_using3DNow:
-		debug(1, "MT32emu: using 3DNow!");
+		debug(1, "MT32emu: using 3DNow! ");
 		break;
 	default:
 		break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.