aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-01-03 04:24:16 +0000
committerTravis Howell2003-01-03 04:24:16 +0000
commit303acc02bb25725f153f282eae44e40f187fb13e (patch)
tree40aa99b03745cc04f2fd4889c69fbc346973a5a3 /simon
parent9df455ce380f4a7389ca093dfd619761c3bea046 (diff)
downloadscummvm-rg350-303acc02bb25725f153f282eae44e40f187fb13e.tar.gz
scummvm-rg350-303acc02bb25725f153f282eae44e40f187fb13e.tar.bz2
scummvm-rg350-303acc02bb25725f153f282eae44e40f187fb13e.zip
Remove sion 1 music warning
Change warning about missing vga file to error svn-id: r6323
Diffstat (limited to 'simon')
-rw-r--r--simon/midi.cpp2
-rw-r--r--simon/simon.cpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp
index 4437947144..ad9c7d24f8 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -321,8 +321,6 @@ void MidiPlayer::read_next_note(Track *t, NoteRec *nr)
if ((cmd_byte & 0xF0) != 0xE0)
break;
- warning ("Malformed pitch bend event skipped");
- warning ("If music sounds screwed up now, submit a bug report");
track_read_byte(t);
// track_read_byte(t);
}
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 09be405203..9fc2eaefbf 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4218,10 +4218,8 @@ void SimonState::read_vga_from_datfile_1(uint vga_id)
sprintf(buf, "%.3d%d.VGA", vga_id >> 1, (vga_id & 1) + 1);
in.open(buf, _gameDataPath);
- if (in.isOpen() == false) {
- warning("read_vga_from_datfile_1: cannot open %s", buf);
- return;
- }
+ if (in.isOpen() == false)
+ error("read_vga_from_datfile_1: cannot open %s", buf);
size = in.size();