From b82f40d9061072e3748868b16f75a8cb767afce0 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 17 Aug 2011 23:54:57 +0200 Subject: DREAMWEB: Fix crash when loading some saves findsource() has the hidden side effect of modifying kTakeoff, and the getreelframeax() conversion reordered a findsource() call and kTakeoff access in e78a5a2b08012dfe786da6d77abcc052436ace9c. --- engines/dreamweb/sprite.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp index 2129d1ca6d..506d0fb694 100644 --- a/engines/dreamweb/sprite.cpp +++ b/engines/dreamweb/sprite.cpp @@ -565,8 +565,9 @@ void DreamGenContext::showgamereel() { const Frame *DreamGenContext::getreelframeax(uint16 frame) { data.word(kCurrentframe) = frame; + Frame* source = findsourceCPP(); uint16 offset = data.word(kCurrentframe) - data.word(kTakeoff); - return findsourceCPP() + offset; + return source + offset; } void DreamGenContext::showrain() { -- cgit v1.2.3