aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-01-11 21:57:24 +0000
committerMax Horn2004-01-11 21:57:24 +0000
commitc55d5d6465f15afc7648c196a3100800002e1737 (patch)
treed37a646267f2c0cc45f7ff1450d6eaed7be35c99 /scumm
parent87e8ccd8c164c76ff37853ec1d7929348422581c (diff)
downloadscummvm-rg350-c55d5d6465f15afc7648c196a3100800002e1737.tar.gz
scummvm-rg350-c55d5d6465f15afc7648c196a3100800002e1737.tar.bz2
scummvm-rg350-c55d5d6465f15afc7648c196a3100800002e1737.zip
pedantic corrections
svn-id: r12330
Diffstat (limited to 'scumm')
-rw-r--r--scumm/midiparser_eup.cpp8
-rw-r--r--scumm/midiparser_ro.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/scumm/midiparser_eup.cpp b/scumm/midiparser_eup.cpp
index 1986c1b0ca..3b8afcb907 100644
--- a/scumm/midiparser_eup.cpp
+++ b/scumm/midiparser_eup.cpp
@@ -149,8 +149,8 @@ void MidiParser_EUP::parseNextEvent (EventInfo &info) {
break;
}
} else {
- printf ("Unknown Euphony music event 0x%02X\n", (int) cmd);
- memset (&info, 0, sizeof(info));
+ warning("Unknown Euphony music event 0x%02X", (int) cmd);
+ memset(&info, 0, sizeof(info));
pos = 0;
break;
}
@@ -163,8 +163,8 @@ bool MidiParser_EUP::loadMusic (byte *data, uint32 size) {
byte *pos = data;
int i;
- if (memcmp (pos, "SO", 2)) {
- printf ("Warning: 'SO' header expected but found '%c%c' instead.\n", pos[0], pos[1]);
+ if (memcmp(pos, "SO", 2)) {
+ warning("'SO' header expected but found '%c%c' instead.", pos[0], pos[1]);
return false;
}
diff --git a/scumm/midiparser_ro.cpp b/scumm/midiparser_ro.cpp
index 3fcc6c72d1..8155fecdb2 100644
--- a/scumm/midiparser_ro.cpp
+++ b/scumm/midiparser_ro.cpp
@@ -120,7 +120,7 @@ bool MidiParser_RO::loadMusic (byte *data, uint32 size) {
byte *pos = data;
if (memcmp (pos, "RO", 2)) {
- printf ("Warning: 'RO' header expected but found '%c%c' instead.\n", pos[0], pos[1]);
+ warning("'RO' header expected but found '%c%c' instead", pos[0], pos[1]);
return false;
}