aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scumm/bundle.cpp2
-rw-r--r--scumm/gfx.cpp4
-rw-r--r--scumm/resource_v2.cpp2
-rw-r--r--scumm/resource_v3.cpp2
-rw-r--r--scumm/script_v5.cpp4
-rw-r--r--scumm/script_v8.cpp10
-rw-r--r--scumm/smush/smush_mixer.cpp6
-rw-r--r--scumm/smush/smush_player.cpp2
8 files changed, 16 insertions, 16 deletions
diff --git a/scumm/bundle.cpp b/scumm/bundle.cpp
index a0b5395436..6d94cd7821 100644
--- a/scumm/bundle.cpp
+++ b/scumm/bundle.cpp
@@ -413,7 +413,7 @@ int32 Bundle::getNumberOfMusicSamplesByName(char *name) {
return number;
}
}
- warning("Couldn't find numsample %s\n", name);
+ warning("Couldn't find numsample %s", name);
return number;
}
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 53d2b09175..afe0983ac6 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2886,7 +2886,7 @@ void Scumm::moveMemInPalRes(int start, int end, byte direction) {
num = end - start;
if (!endptr) {
- warning("moveMemInPalRes(%d,%d): Bad end pointer\n", start, end);
+ warning("moveMemInPalRes(%d,%d): Bad end pointer", start, end);
return;
}
@@ -2916,7 +2916,7 @@ void Scumm::palManipulateInit(int start, int end, int string_id, int time) {
string2 = getStringAddress(string_id + 1);
string3 = getStringAddress(string_id + 2);
if (!string1 || !string2 || !string3) {
- warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d\n",
+ warning("palManipulateInit(%d,%d,%d,%d): Cannot obtain string resources %d, %d and %d",
start, end, string_id, time, string_id, string_id + 1, string_id + 2);
return;
}
diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp
index b0da1dc912..76d997ad87 100644
--- a/scumm/resource_v2.cpp
+++ b/scumm/resource_v2.cpp
@@ -34,7 +34,7 @@ void Scumm_v2::readIndexFile() {
magic = _fileHandle.readUint16LE();
if (magic != 0x0100)
- warning("The magic id doesn't match (0x%X)\n", magic);
+ warning("The magic id doesn't match (0x%X)", magic);
_numGlobalObjects = _fileHandle.readUint16LE();
_fileHandle.seek(_numGlobalObjects, SEEK_CUR); // Skip object flags
diff --git a/scumm/resource_v3.cpp b/scumm/resource_v3.cpp
index 1a5836ec54..eea2ec334e 100644
--- a/scumm/resource_v3.cpp
+++ b/scumm/resource_v3.cpp
@@ -36,7 +36,7 @@ void Scumm_v3::readIndexFile() {
magic = _fileHandle.readUint16LE();
if (magic != 0x0100)
- warning("The magic id doesn't match (0x%X)\n", magic);
+ warning("The magic id doesn't match (0x%X)", magic);
_numGlobalObjects = _fileHandle.readUint16LE();
_fileHandle.seek(_numGlobalObjects * 4, SEEK_CUR);
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index a3a3277eb3..b62661f7cc 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -836,7 +836,7 @@ void Scumm_v5::o5_getStringWidth() {
width = _charset->getStringWidth(0, ptr);
setResult(width);
- warning("o5_getStringWidth, result %d\n", width);
+ warning("o5_getStringWidth, result %d", width);
}
void Scumm_v5::o5_saveLoadVars() {
@@ -2464,7 +2464,7 @@ void Scumm_v5::decodeParseString() {
{
int a = getVarOrDirectWord(0x80);
int b = getVarOrDirectWord(0x40);
- warning("Scumm_v5::decodeParseString: Unhandled case 3: %d, %d\n", a, b);
+ warning("Scumm_v5::decodeParseString: Unhandled case 3: %d, %d", a, b);
}
break;
case 4: /* center */
diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp
index b263cdeece..469e5e8412 100644
--- a/scumm/script_v8.cpp
+++ b/scumm/script_v8.cpp
@@ -1361,7 +1361,7 @@ void Scumm_v8::o8_kernelSetFunctions() {
case 11: { // lockObject
int objidx = getObjectIndex(args[1]);
if (objidx == -1) {
- warning("Cannot find object %d to lock\n", args[1]);
+ warning("Cannot find object %d to lock", args[1]);
break;
}
@@ -1375,7 +1375,7 @@ void Scumm_v8::o8_kernelSetFunctions() {
case 12: { // unlockObject
int objidx = getObjectIndex(args[1]);
if (objidx == -1) {
- warning("Cannot find object %d to unlock\n", args[1]);
+ warning("Cannot find object %d to unlock", args[1]);
break;
}
@@ -1452,7 +1452,7 @@ void Scumm_v8::o8_kernelSetFunctions() {
_saveLoadSlot = args[1];
_saveLoadFlag = 2;
_saveLoadCompatible = false;
- warning("Sgl: %d\n", args[1]);
+ warning("Sgl: %d", args[1]);
break;
}
case 28: // saveGameStampScreenshot
@@ -1520,7 +1520,7 @@ void Scumm_v8::o8_kernelGetFunctions() {
push(0);
break;
default:
- warning("getKeyState(0x%X)\n", args[1]);
+ warning("getKeyState(0x%X)", args[1]);
push(0);
break;
}
@@ -1636,7 +1636,7 @@ void Scumm_v8::o8_kernelGetFunctions() {
}
break;
case 0xE1: // imGetMusicPosition
- warning("o8_kernelGetFunctions: imGetMusicPosition(stub)\n");
+ warning("o8_kernelGetFunctions: imGetMusicPosition(stub)");
// FIXME - get this stuff to be properly implemented
push(_sound->_bundleMusicPosition);
break;
diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp
index 33211f0d05..69eb686ce9 100644
--- a/scumm/smush/smush_mixer.cpp
+++ b/scumm/smush/smush_mixer.cpp
@@ -59,7 +59,7 @@ bool SmushMixer::addChannel(SmushChannel *c) {
for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
if(_channels[i].id == track)
- warning("SmushMixer::addChannel(%d) : channel already exist !", track);
+ warning("SmushMixer::addChannel(%d) : channel already exists", track);
}
if(_nextIndex >= SoundMixer::NUM_CHANNELS)
_nextIndex = _mixer->_beginSlots;
@@ -84,10 +84,10 @@ bool SmushMixer::addChannel(SmushChannel *c) {
}
}
- warning("_nextIndex == %d\n", _nextIndex);
+ warning("_nextIndex == %d", _nextIndex);
for(i = _mixer->_beginSlots; i < SoundMixer::NUM_CHANNELS; i++) {
- warning("channel %d : %p(%d, %d) %d %d\n", i, (void *)_channels[i].chan,
+ warning("channel %d : %p(%d, %d) %d %d", i, (void *)_channels[i].chan,
_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
_channels[i].chan ? _channels[i].chan->isTerminated() : 1,
_channels[i].first, _channels[i].mixer_index);
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index ccd09234cf..d851399dbd 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -584,7 +584,7 @@ void SmushPlayer::handleTextResource(Chunk &b) {
sf->drawStringWrapCentered(string2, _data, _width, _height, pos_x, MAX(pos_y, top), width);
break;
default:
- warning("SmushPlayer::handleTextResource. Not handled flags: %d\n", flags);
+ warning("SmushPlayer::handleTextResource. Not handled flags: %d", flags);
}
if (string != NULL) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 23:08:36 +0000