thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed extra exclamation marks in warning() calls as well.

Browse source 
svn-id: r21608
This commit is contained in:
Eugene Sandulenko 2006-04-04 22:21:10 +00:00
parent d292c0ec55
commit 8fa9bd6728
15 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/gp32/gp32std.cpp
View file

@ -343,7 +343,7 @@ void *gp_calloc(size_t nitems, size_t size) {
gp_memset(p, 0, nitems * size); gp_memset(p, 0, nitems * size);
// if (*(uint8 *)p != 0) // 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; return p;
} }
@ -359,12 +359,12 @@ void gp_free(void *block) {
np = ((uint32) block) - sizeof(uint32); np = ((uint32) block) - sizeof(uint32);
up = (uint32 *) np; up = (uint32 *) np;
if (*up == 0x4321) { if (*up == 0x4321) {
warning("%s: double deallocation!", __FUNCTION__); warning("%s: double deallocation", __FUNCTION__);
return; return;
} }
if (*up != 0x1234) { if (*up != 0x1234) {
warning("%s: corrupt block!", __FUNCTION__); warning("%s: corrupt block", __FUNCTION__);
return; return;
} }
*up = 0x4321; *up = 0x4321;

2
common/timer.cpp
View file

@ -111,7 +111,7 @@ bool Timer::installTimerProc(TimerProc procedure, int32 interval, void *refCon)
} }
} }
warning("Couldn't find free timer slot!"); warning("Couldn't find free timer slot");
return false; return false;
} }

2
engines/gob/draw.cpp
View file

@ -859,7 +859,7 @@ void Draw::printText(void) {
_renderFlags = savedFlags; _renderFlags = savedFlags;
if (_renderFlags & 4) { if (_renderFlags & 4) {
warning("printText: Input not supported!"); warning("printText: Input not supported");
// xor ax, ax // xor ax, ax
// loc_436_1391: // loc_436_1391:
// xor dx, dx // xor dx, dx

2
engines/gob/inter_v1.cpp
View file

@ -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) { 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->_destSurface = load16();
_vm->_draw->_destSpriteX = _vm->_parse->parseValExpr(); _vm->_draw->_destSpriteX = _vm->_parse->parseValExpr();
_vm->_draw->_destSpriteY = _vm->_parse->parseValExpr(); _vm->_draw->_destSpriteY = _vm->_parse->parseValExpr();

2
engines/gob/mult_v2.cpp
View file

@ -220,7 +220,7 @@ void Mult_v2::loadMult(int16 resId) {
} }
if (i == j) { if (i == j) {
warning("GOB2 Stub! Mult_Data.sndSlot"); 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); _multData2->sndSlot[_multData2->sndSlotsCount] = _vm->_inter->loadSound(1);
_vm->_inter->loadSound(1); _vm->_inter->loadSound(1);
// _multData2->sndKeys[i].soundIndex = _multData2->sndSlot[_multData2->sndSlotsCount] & 0x7FFF; // _multData2->sndKeys[i].soundIndex = _multData2->sndSlot[_multData2->sndSlotsCount] & 0x7FFF;

4
engines/gob/util.cpp
View file

@ -41,7 +41,7 @@ Util::Util(GobEngine *vm) : _vm(vm) {
void Util::addKeyToBuffer(int16 key) { void Util::addKeyToBuffer(int16 key) {
if ((_keyBufferHead + 1) % KEYBUFSIZE == _keyBufferTail) { if ((_keyBufferHead + 1) % KEYBUFSIZE == _keyBufferTail) {
warning("key buffer overflow!"); warning("key buffer overflow");
return; return;
} }
@ -395,7 +395,7 @@ void Util::listInsertBack(List * list, void *data) {
if (list->pHead != 0) { if (list->pHead != 0) {
if (list->pTail == 0) { if (list->pTail == 0) {
list->pTail = list->pHead; list->pTail = list->pHead;
warning("listInsertBack: Broken list!"); warning("listInsertBack: Broken list");
} }
node = new ListNode; node = new ListNode;

2
engines/kyra/gui.cpp
View file

@ -643,7 +643,7 @@ int KyraEngine::getNextSavegameSlot() {
return i; return i;
} }
} }
warning("Didn't save: Ran out of savegame filenames!"); warning("Didn't save: Ran out of savegame filenames");
return 0; return 0;
} }

4
engines/kyra/saveload.cpp
View file

@ -65,11 +65,11 @@ void KyraEngine::loadGame(const char *fileName) {
if (version >= 2) { if (version >= 2) {
uint32 gameFlags = in->readUint32BE(); uint32 gameFlags = in->readUint32BE();
if ((gameFlags & GF_FLOPPY) && !(_features & GF_FLOPPY)) { 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; delete in;
return; return;
} else if ((gameFlags & GF_TALKIE) && !(_features & GF_TALKIE)) { } 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; delete in;
return; return;
} }

4
engines/kyra/sound.cpp
View file

@ -241,7 +241,7 @@ void SoundMidiPC::playMusic(uint8 *data, uint32 size) {
assert(_parser); assert(_parser);
if (!_parser->loadMusic(data, size)) { if (!_parser->loadMusic(data, size)) {
warning("Error reading track!"); warning("Error reading track");
delete _parser; delete _parser;
_parser = 0; _parser = 0;
return; return;
@ -276,7 +276,7 @@ void SoundMidiPC::loadSoundEffectFile(uint8 *data, uint32 size) {
assert(_soundEffect); assert(_soundEffect);
if (!_soundEffect->loadMusic(data, size)) { if (!_soundEffect->loadMusic(data, size)) {
warning("Error reading track!"); warning("Error reading track");
delete _parser; delete _parser;
_parser = 0; _parser = 0;
return; return;

2
engines/saga/actor.cpp
View file

@ -1139,7 +1139,7 @@ void Actor::handleSpeech(int msec) {
if (_activeSpeech.slowModeCharIndex >= stringLength) if (_activeSpeech.slowModeCharIndex >= stringLength)
error("Wrong string index"); error("Wrong string index");
warning("Slow string encountered!"); warning("Slow string encountered");
_activeSpeech.playingTime = stringLength * 1000 / 4; _activeSpeech.playingTime = stringLength * 1000 / 4;
} else { } else {

4
engines/scumm/sound.cpp
View file

@ -616,11 +616,11 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle
sizeof(MP3OffsetTable), compareMP3OffsetTable); sizeof(MP3OffsetTable), compareMP3OffsetTable);
if (result == NULL) { if (result == NULL) {
warning("startTalkSound: did not find sound at offset %d !", offset); warning("startTalkSound: did not find sound at offset %d", offset);
return; return;
} }
if (2 * num != result->num_tags) { 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); result->num_tags);
num = result->num_tags; num = result->num_tags;
} }

8
engines/simon/midi.cpp
View file

@ -485,7 +485,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) {
in->read(&buf[2], 2); in->read(&buf[2], 2);
} }
if (memcmp(buf, "CAT ", 4)) { 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; return;
} }
size += 4 + in->readUint32BE(); size += 4 + in->readUint32BE();
@ -493,7 +493,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) {
p->data = (byte *) calloc(size, 1); p->data = (byte *) calloc(size, 1);
in->read(p->data, size); in->read(p->data, size);
} else { } 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; return;
} }
@ -501,7 +501,7 @@ void MidiPlayer::loadXMIDI(Common::File *in, bool sfx) {
parser->setMidiDriver(this); parser->setMidiDriver(this);
parser->setTimerRate(_driver->getBaseTempo()); parser->setTimerRate(_driver->getBaseTempo());
if (!parser->loadMusic(p->data, size)) { if (!parser->loadMusic(p->data, size)) {
warning("Error reading track!"); warning("Error reading track");
delete parser; delete parser;
parser = 0; parser = 0;
} }
@ -531,7 +531,7 @@ void MidiPlayer::loadS1D (Common::File *in, bool sfx) {
parser->setMidiDriver(this); parser->setMidiDriver(this);
parser->setTimerRate(_driver->getBaseTempo()); parser->setTimerRate(_driver->getBaseTempo());
if (!parser->loadMusic(p->data, size)) { if (!parser->loadMusic(p->data, size)) {
warning("Error reading track!"); warning("Error reading track");
delete parser; delete parser;
parser = 0; parser = 0;
} }

2
engines/sky/logic.cpp
View file

@ -1551,7 +1551,7 @@ bool Logic::fnGetTo(uint32 targetPlaceId, uint32 mode, uint32 c) {
} }
uint16 *getToTable = (uint16*)_skyCompact->fetchCpt(cpt->getToTableId); uint16 *getToTable = (uint16*)_skyCompact->fetchCpt(cpt->getToTableId);
if (!getToTable) { if (!getToTable) {
warning("Place compact's getToTable is NULL!"); warning("Place compact's getToTable is NULL");
return false; return false;
} }

2
engines/sword1/sound.cpp
View file

@ -181,7 +181,7 @@ void Sound::playSample(QueueElement *elem) {
bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { bool Sound::startSpeech(uint16 roomNo, uint16 localNo) {
if (_cowHeader == NULL) { if (_cowHeader == NULL) {
warning("Sound::startSpeech: COW file isn't open!"); warning("Sound::startSpeech: COW file isn't open");
return false; return false;
} }

2
sound/midiparser_xmidi.cpp
View file

@ -175,7 +175,7 @@ bool MidiParser_XMIDI::loadMusic(byte *data, uint32 size) {
// Must be at least 2 bytes long // Must be at least 2 bytes long
if (chunk_len < 2) { 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; return false;
} }