[Scummvm-cvs-logs] SF.net SVN: scummvm: [21608] scummvm/trunk/sound
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Apr 4 15:23:04 CEST 2006
Revision: 21608
Author: sev
Date: 2006-04-04 15:21:10 -0700 (Tue, 04 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21608&view=rev
Log Message:
-----------
Removed extra exclamation marks in warning() calls as well.
Modified Paths:
--------------
scummvm/trunk/backends/gp32/gp32std.cpp
scummvm/trunk/common/timer.cpp
scummvm/trunk/engines/gob/draw.cpp
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/mult_v2.cpp
scummvm/trunk/engines/gob/util.cpp
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/saga/actor.cpp
scummvm/trunk/engines/scumm/sound.cpp
scummvm/trunk/engines/simon/midi.cpp
scummvm/trunk/engines/sky/logic.cpp
scummvm/trunk/engines/sword1/sound.cpp
scummvm/trunk/sound/midiparser_xmidi.cpp
Modified: scummvm/trunk/backends/gp32/gp32std.cpp
===================================================================
--- scummvm/trunk/backends/gp32/gp32std.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/backends/gp32/gp32std.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -343,7 +343,7 @@
gp_memset(p, 0, nitems * size);
// if (*(uint8 *)p != 0)
-// warning("%s: calloc doesn't clear!", __FUNCTION__); //fixme: was error
+// warning("%s: calloc doesn't clear", __FUNCTION__); //fixme: was error
return p;
}
@@ -359,12 +359,12 @@
np = ((uint32) block) - sizeof(uint32);
up = (uint32 *) np;
if (*up == 0x4321) {
- warning("%s: double deallocation!", __FUNCTION__);
+ warning("%s: double deallocation", __FUNCTION__);
return;
}
if (*up != 0x1234) {
- warning("%s: corrupt block!", __FUNCTION__);
+ warning("%s: corrupt block", __FUNCTION__);
return;
}
*up = 0x4321;
Modified: scummvm/trunk/common/timer.cpp
===================================================================
--- scummvm/trunk/common/timer.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/common/timer.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -111,7 +111,7 @@
}
}
- warning("Couldn't find free timer slot!");
+ warning("Couldn't find free timer slot");
return false;
}
Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/gob/draw.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -859,7 +859,7 @@
_renderFlags = savedFlags;
if (_renderFlags & 4) {
- warning("printText: Input not supported!");
+ warning("printText: Input not supported");
// xor ax, ax
// loc_436_1391:
// xor dx, dx
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -1078,7 +1078,7 @@
}
bool Inter_v1::o1_invalidate(char &cmdCount, int16 &counter, int16 &retFlag) {
- warning("invalidate: 'bugged' function!");
+ warning("invalidate: 'bugged' function");
_vm->_draw->_destSurface = load16();
_vm->_draw->_destSpriteX = _vm->_parse->parseValExpr();
_vm->_draw->_destSpriteY = _vm->_parse->parseValExpr();
Modified: scummvm/trunk/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/mult_v2.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/gob/mult_v2.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -220,7 +220,7 @@
}
if (i == j) {
warning("GOB2 Stub! Mult_Data.sndSlot");
- warning("GOB2 Stub! Game::interLoadSound() differs!");
+ warning("GOB2 Stub! Game::interLoadSound() differs");
_multData2->sndSlot[_multData2->sndSlotsCount] = _vm->_inter->loadSound(1);
_vm->_inter->loadSound(1);
// _multData2->sndKeys[i].soundIndex = _multData2->sndSlot[_multData2->sndSlotsCount] & 0x7FFF;
Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/gob/util.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -41,7 +41,7 @@
void Util::addKeyToBuffer(int16 key) {
if ((_keyBufferHead + 1) % KEYBUFSIZE == _keyBufferTail) {
- warning("key buffer overflow!");
+ warning("key buffer overflow");
return;
}
@@ -395,7 +395,7 @@
if (list->pHead != 0) {
if (list->pTail == 0) {
list->pTail = list->pHead;
- warning("listInsertBack: Broken list!");
+ warning("listInsertBack: Broken list");
}
node = new ListNode;
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/kyra/gui.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -643,7 +643,7 @@
return i;
}
}
- warning("Didn't save: Ran out of savegame filenames!");
+ warning("Didn't save: Ran out of savegame filenames");
return 0;
}
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -65,11 +65,11 @@
if (version >= 2) {
uint32 gameFlags = in->readUint32BE();
if ((gameFlags & GF_FLOPPY) && !(_features & GF_FLOPPY)) {
- warning("can not load floppy savefile for this (non floppy) gameversion!");
+ warning("can not load floppy savefile for this (non floppy) gameversion");
delete in;
return;
} else if ((gameFlags & GF_TALKIE) && !(_features & GF_TALKIE)) {
- warning("can not load cdrom savefile for this (non cdrom) gameversion!");
+ warning("can not load cdrom savefile for this (non cdrom) gameversion");
delete in;
return;
}
Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/kyra/sound.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -241,7 +241,7 @@
assert(_parser);
if (!_parser->loadMusic(data, size)) {
- warning("Error reading track!");
+ warning("Error reading track");
delete _parser;
_parser = 0;
return;
@@ -276,7 +276,7 @@
assert(_soundEffect);
if (!_soundEffect->loadMusic(data, size)) {
- warning("Error reading track!");
+ warning("Error reading track");
delete _parser;
_parser = 0;
return;
Modified: scummvm/trunk/engines/saga/actor.cpp
===================================================================
--- scummvm/trunk/engines/saga/actor.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/saga/actor.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -1139,7 +1139,7 @@
if (_activeSpeech.slowModeCharIndex >= stringLength)
error("Wrong string index");
- warning("Slow string encountered!");
+ warning("Slow string encountered");
_activeSpeech.playingTime = stringLength * 1000 / 4;
} else {
Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/scumm/sound.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -616,11 +616,11 @@
sizeof(MP3OffsetTable), compareMP3OffsetTable);
if (result == NULL) {
- warning("startTalkSound: did not find sound at offset %d !", offset);
+ warning("startTalkSound: did not find sound at offset %d", offset);
return;
}
if (2 * num != result->num_tags) {
- warning("startTalkSound: number of tags do not match (%d - %d) !", b,
+ warning("startTalkSound: number of tags do not match (%d - %d)", b,
result->num_tags);
num = result->num_tags;
}
Modified: scummvm/trunk/engines/simon/midi.cpp
===================================================================
--- scummvm/trunk/engines/simon/midi.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/simon/midi.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -485,7 +485,7 @@
in->read(&buf[2], 2);
}
if (memcmp(buf, "CAT ", 4)) {
- warning("Could not find 'CAT ' tag to determine resource size!");
+ warning("Could not find 'CAT ' tag to determine resource size");
return;
}
size += 4 + in->readUint32BE();
@@ -493,7 +493,7 @@
p->data = (byte *) calloc(size, 1);
in->read(p->data, size);
} else {
- warning("Expected 'FORM' tag but found '%c%c%c%c' instead!", buf[0], buf[1], buf[2], buf[3]);
+ warning("Expected 'FORM' tag but found '%c%c%c%c' instead", buf[0], buf[1], buf[2], buf[3]);
return;
}
@@ -501,7 +501,7 @@
parser->setMidiDriver(this);
parser->setTimerRate(_driver->getBaseTempo());
if (!parser->loadMusic(p->data, size)) {
- warning("Error reading track!");
+ warning("Error reading track");
delete parser;
parser = 0;
}
@@ -531,7 +531,7 @@
parser->setMidiDriver(this);
parser->setTimerRate(_driver->getBaseTempo());
if (!parser->loadMusic(p->data, size)) {
- warning("Error reading track!");
+ warning("Error reading track");
delete parser;
parser = 0;
}
Modified: scummvm/trunk/engines/sky/logic.cpp
===================================================================
--- scummvm/trunk/engines/sky/logic.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/sky/logic.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -1551,7 +1551,7 @@
}
uint16 *getToTable = (uint16*)_skyCompact->fetchCpt(cpt->getToTableId);
if (!getToTable) {
- warning("Place compact's getToTable is NULL!");
+ warning("Place compact's getToTable is NULL");
return false;
}
Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/engines/sword1/sound.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -181,7 +181,7 @@
bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
if (_cowHeader == NULL) {
- warning("Sound::startSpeech: COW file isn't open!");
+ warning("Sound::startSpeech: COW file isn't open");
return false;
}
Modified: scummvm/trunk/sound/midiparser_xmidi.cpp
===================================================================
--- scummvm/trunk/sound/midiparser_xmidi.cpp 2006-04-04 22:04:51 UTC (rev 21607)
+++ scummvm/trunk/sound/midiparser_xmidi.cpp 2006-04-04 22:21:10 UTC (rev 21608)
@@ -175,7 +175,7 @@
// Must be at least 2 bytes long
if (chunk_len < 2) {
- warning("Invalid chunk length %d for 'INFO' block!", (int)chunk_len);
+ warning("Invalid chunk length %d for 'INFO' block", (int)chunk_len);
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list