[Scummvm-cvs-logs] scummvm master -> bd4bc2215f75926b9cab6ca2458bf7b2f604769f
tramboi
bertrand_augereau at yahoo.fr
Wed Sep 7 12:29:07 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bd4bc2215f DREAMWEB: Fix quitting in the inventory screen
Commit: bd4bc2215f75926b9cab6ca2458bf7b2f604769f
https://github.com/scummvm/scummvm/commit/bd4bc2215f75926b9cab6ca2458bf7b2f604769f
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-09-02T11:54:48-07:00
Commit Message:
DREAMWEB: Fix quitting in the inventory screen
Changed paths:
devtools/tasmrecover/dreamweb/object.asm
engines/dreamweb/dreamgen.cpp
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index e6f8037..807a100 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -336,11 +336,16 @@ waitexam: ;call delpointer
jz notuseinv
mov bx,offset cs:withlist1
notuseinv: call checkcoords
+
+ cmp quitrequested, 0
+ jnz stopwaiting
+
cmp examagain,0
jz norex
jmp examineagain
norex: cmp getback,0
jz waitexam
+stopwaiting:
mov pickup,0
cmp watchingtime,0
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index df235c5..70f84a2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -3921,6 +3921,9 @@ waitexam:
bx = offset_withlist1;
notuseinv:
checkcoords();
+ _cmp(data.byte(kQuitrequested), 0);
+ if (!flags.z())
+ goto stopwaiting;
_cmp(data.byte(kExamagain), 0);
if (flags.z())
goto norex;
@@ -3929,6 +3932,7 @@ norex:
_cmp(data.byte(kGetback), 0);
if (flags.z())
goto waitexam;
+stopwaiting:
data.byte(kPickup) = 0;
_cmp(data.word(kWatchingtime), 0);
if (!flags.z())
@@ -4301,7 +4305,7 @@ doopeninv:
data.byte(kOpenedob) = 255;
goto waitexam;
return;
-/*continuing to unbounded code: examineagain from examineob:3-66*/
+/*continuing to unbounded code: examineagain from examineob:3-69*/
examineagain:
data.byte(kInmaparea) = 0;
data.byte(kExamagain) = 0;
@@ -4344,6 +4348,9 @@ waitexam:
bx = offset_withlist1;
notuseinv:
checkcoords();
+ _cmp(data.byte(kQuitrequested), 0);
+ if (!flags.z())
+ goto stopwaiting;
_cmp(data.byte(kExamagain), 0);
if (flags.z())
goto norex;
@@ -4352,6 +4359,7 @@ norex:
_cmp(data.byte(kGetback), 0);
if (flags.z())
goto waitexam;
+stopwaiting:
data.byte(kPickup) = 0;
_cmp(data.word(kWatchingtime), 0);
if (!flags.z())
More information about the Scummvm-git-logs
mailing list