diff options
| author | Jamieson Christian | 2003-05-26 20:42:25 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-26 20:42:25 +0000 |
| commit | ebedd3b41c2751ee084247fd04785216fcd37e4f (patch) | |
| tree | 6a29544f9598a077caaa1602c8ed14bc472305e7 | |
| parent | 9357a99e00decef46def55baaaac1c53121c5a4d (diff) | |
| download | scummvm-rg350-ebedd3b41c2751ee084247fd04785216fcd37e4f.tar.gz scummvm-rg350-ebedd3b41c2751ee084247fd04785216fcd37e4f.tar.bz2 scummvm-rg350-ebedd3b41c2751ee084247fd04785216fcd37e4f.zip | |
Fixed a MORONIC oob memory write. Now back to remedial C++ class
svn-id: r8019
| -rw-r--r-- | scumm/imuse.cpp | 3 | ||||
| -rw-r--r-- | scumm/imuse_internal.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp index 0b499f3764..446d7531b2 100644 --- a/scumm/imuse.cpp +++ b/scumm/imuse.cpp @@ -1161,8 +1161,7 @@ void IMuseInternal::addDeferredCommand (int time, int a, int b, int c, int d, in break; } - if (ptr) { - ptr->midi = _midi_native ? _midi_native : _midi_adlib; + if (i) { ptr->time_left = time * 10000; ptr->a = a; ptr->b = b; diff --git a/scumm/imuse_internal.h b/scumm/imuse_internal.h index b439052800..922a99315b 100644 --- a/scumm/imuse_internal.h +++ b/scumm/imuse_internal.h @@ -129,7 +129,6 @@ struct ParameterFader { }; struct DeferredCommand { - MidiDriver *midi; uint32 time_left; int a, b, c, d, e, f; DeferredCommand() { memset (this, 0, sizeof (DeferredCommand)); } |