diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /engines/parallaction/sound_br.cpp | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'engines/parallaction/sound_br.cpp')
| -rw-r--r-- | engines/parallaction/sound_br.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp index 407dd86ec3..f1def31f9f 100644 --- a/engines/parallaction/sound_br.cpp +++ b/engines/parallaction/sound_br.cpp @@ -130,7 +130,7 @@ void MidiParser_MSC::parseMidiEvent(EventInfo &info) { break; default: - warning("Unexpected midi event 0x%02X in midi data.", info.event); + warning("Unexpected midi event 0x%02X in midi data", info.event); } //if ((type == 0xB) && (info.basic.param1 == 64)) info.basic.param2 = 127; @@ -173,7 +173,7 @@ bool MidiParser_MSC::loadMusic(byte *data, uint32 size) { byte *pos = data; if (memcmp("MSCt", pos, 4)) { - warning("Expected header not found in music file."); + warning("Expected header not found in music file"); return false; } pos += 4; |