aboutsummaryrefslogtreecommitdiff
path: root/engines/dm
diff options
context:
space:
mode:
authorBendegúz Nagy2016-07-13 17:34:05 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit5602d07f966ed16c5c74d014fe596ef15bcf825d (patch)
tree48ed60e745a0938d00cd5c72fef5b69bd032f7b9 /engines/dm
parentb4bebaa845ecd729576e143818fcc7b378262b5b (diff)
downloadscummvm-rg350-5602d07f966ed16c5c74d014fe596ef15bcf825d.tar.gz
scummvm-rg350-5602d07f966ed16c5c74d014fe596ef15bcf825d.tar.bz2
scummvm-rg350-5602d07f966ed16c5c74d014fe596ef15bcf825d.zip
DM: Fix Timeline _g370_events initialization
Diffstat (limited to 'engines/dm')
-rw-r--r--engines/dm/TODOs/todo.txt3
-rw-r--r--engines/dm/timeline.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/dm/TODOs/todo.txt b/engines/dm/TODOs/todo.txt
index 9137975b9f..d8821e6015 100644
--- a/engines/dm/TODOs/todo.txt
+++ b/engines/dm/TODOs/todo.txt
@@ -7,8 +7,7 @@ Bugs:
Logic:
When object are put on the right side of the current square, they disappear
Drawing door ornaments segfaults when going back to the start
- !! It seems that that deleted events' _type fields are not getting set to 0, when looking for available slots, the code looks for events with 0 _type fields,
- this results in segfaults
+
Possible bugs:
- k1_LeftMouseButton and k2_RightMouseButton have values 1 and 2 respectively, contrary to the original in the original: MASK0x0001_MOUSE_RIGHT_BUTTON, MASK0x0002_MOUSE_LEFT_BUTTON
diff --git a/engines/dm/timeline.cpp b/engines/dm/timeline.cpp
index 55c1e4bb66..3858ad512e 100644
--- a/engines/dm/timeline.cpp
+++ b/engines/dm/timeline.cpp
@@ -103,7 +103,7 @@ void Timeline::f233_initTimeline() {
_g371_timeline = new uint16[_g369_eventMaxCount];
if (_vm->_g298_newGame) {
for (int16 i = 0; i < _g369_eventMaxCount; ++i)
- _g370_events->_type = k0_TMEventTypeNone;
+ _g370_events[i]._type = k0_TMEventTypeNone;
_g372_eventCount = 0;
_g373_firstUnusedEventIndex = 0;
}