From 8fa9bd6728a1d739bd53c297b92f962e465fa88e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Tue, 4 Apr 2006 22:21:10 +0000 Subject: Removed extra exclamation marks in warning() calls as well. svn-id: r21608 --- engines/gob/draw.cpp | 2 +- engines/gob/inter_v1.cpp | 2 +- engines/gob/mult_v2.cpp | 2 +- engines/gob/util.cpp | 4 ++-- engines/kyra/gui.cpp | 2 +- engines/kyra/saveload.cpp | 4 ++-- engines/kyra/sound.cpp | 4 ++-- engines/saga/actor.cpp | 2 +- engines/scumm/sound.cpp | 4 ++-- engines/simon/midi.cpp | 8 ++++---- engines/sky/logic.cpp | 2 +- engines/sword1/sound.cpp | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) (limited to 'engines') diff --git a/engines/gob/draw.cpp b/engines/gob/draw.cpp index caf4a73ce8..6e1e2a1da3 100644 --- a/engines/gob/draw.cpp +++ b/engines/gob/draw.cpp @@ -859,7 +859,7 @@ void Draw::printText(void) { _renderFlags = savedFlags; if (_renderFlags & 4) { - warning("printText: Input not supported!"); + warning("printText: Input not supported"); // xor ax, ax // loc_436_1391: // xor dx, dx diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index 88cb5f2307..71e6b5ba63 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -1078,7 +1078,7 @@ bool Inter_v1::o1_strToLong(char &cmdCount, int16 &counter, int16 &retFlag) { } 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(); diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 3c105f8528..899acc1592 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -220,7 +220,7 @@ void Mult_v2::loadMult(int16 resId) { } 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; diff --git a/engines/gob/util.cpp b/engines/gob/util.cpp index 7e6996f00f..64426c8fd5 100644 --- a/engines/gob/util.cpp +++ b/engines/gob/util.cpp @@ -41,7 +41,7 @@ Util::Util(GobEngine *vm) : _vm(vm) { void Util::addKeyToBuffer(int16 key) { if ((_keyBufferHead + 1) % KEYBUFSIZE == _keyBufferTail) { - warning("key buffer overflow!"); + warning("key buffer overflow"); return; } @@ -395,7 +395,7 @@ void Util::listInsertBack(List * list, void *data) { if (list->pHead != 0) { if (list->pTail == 0) { list->pTail = list->pHead; - warning("listInsertBack: Broken list!"); + warning("listInsertBack: Broken list"); } node = new ListNode; diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 43b760063c..40fb93f1e3 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -643,7 +643,7 @@ int KyraEngine::getNextSavegameSlot() { return i; } } - warning("Didn't save: Ran out of savegame filenames!"); + warning("Didn't save: Ran out of savegame filenames"); return 0; } diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index f56913fe86..5550f5c91c 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -65,11 +65,11 @@ void KyraEngine::loadGame(const char *fileName) { 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; } diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 482ed96e61..7874a02d6a 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -241,7 +241,7 @@ void SoundMidiPC::playMusic(uint8 *data, uint32 size) { assert(_parser); if (!_parser->loadMusic(data, size)) { - warning("Error reading track!"); + warning("Error reading track"); delete _parser; _parser = 0; return; @@ -276,7 +276,7 @@ void SoundMidiPC::loadSoundEffectFile(uint8 *data, uint32 size) { assert(_soundEffect); if (!_soundEffect->loadMusic(data, size)) { - warning("Error reading track!"); + warning("Error reading track"); delete _parser; _parser = 0; return; diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 761e1af001..4b2f5a5cd9 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -1139,7 +1139,7 @@ void Actor::handleSpeech(int msec) { if (_activeSpeech.slowModeCharIndex >= stringLength) error("Wrong string index"); - warning("Slow string encountered!"); + warning("Slow string encountered"); _activeSpeech.playingTime = stringLength * 1000 / 4; } else { diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 55dbbe8281..2a94230ce6 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -616,11 +616,11 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle 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; } diff --git a/engines/simon/midi.cpp b/engines/simon/midi.cpp index 915bc7108f..4c6a971dcf 100644 --- a/engines/simon/midi.cpp +++ b/engines/simon/midi.cpp @@ -485,7 +485,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) { 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 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) { 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 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) { 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 @@ void MidiPlayer::loadS1D (Common::File *in, bool sfx) { 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; } diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp index 5c63c22f85..8ff791966c 100644 --- a/engines/sky/logic.cpp +++ b/engines/sky/logic.cpp @@ -1551,7 +1551,7 @@ bool Logic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) { } 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; } diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index 63494a936b..8529f11f54 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -181,7 +181,7 @@ void Sound::playSample(QueueElement *elem) { 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; } -- cgit v1.2.3