aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-06-16 16:29:48 +0200
committerWillem Jan Palenstijn2011-06-16 16:29:48 +0200
commit2c76a4af40fdafecd5191c55b3d54b204022c13b (patch)
tree98ed51c2cd7c56e346a9da3c08d3ee0eef49e18d
parent287c23f1263c77fa04d2a697f441d362ed419b5d (diff)
downloadscummvm-rg350-2c76a4af40fdafecd5191c55b3d54b204022c13b.tar.gz
scummvm-rg350-2c76a4af40fdafecd5191c55b3d54b204022c13b.tar.bz2
scummvm-rg350-2c76a4af40fdafecd5191c55b3d54b204022c13b.zip
DREAMWEB: Fix probably copy-paste error in asm
This removes an (empty) 'unbounded code' block in dreamgen.cpp
-rw-r--r--devtools/tasmrecover/dreamweb/sprite.asm2
-rw-r--r--engines/dreamweb/dreamgen.cpp6
2 files changed, 2 insertions, 6 deletions
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm
index bb7ba402f8..f6e883abeb 100644
--- a/devtools/tasmrecover/dreamweb/sprite.asm
+++ b/devtools/tasmrecover/dreamweb/sprite.asm
@@ -441,7 +441,7 @@ notinbed: ret
Edeninbath proc near
cmp generaldead,0
- jz notinbed
+ jz notinbath
cmp sartaindead,0
jnz notinbath
call showgamereel
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 000b6d7e43..1d079d9571 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -632,16 +632,12 @@ void edeninbath(Context &context) {
STACK_CHECK(context);
context._cmp(context.data.byte(kGeneraldead), 0);
if (context.flags.z())
- goto notinbed;
+ return /* (notinbath) */;
context._cmp(context.data.byte(kSartaindead), 0);
if (!context.flags.z())
return /* (notinbath) */;
showgamereel(context);
addtopeoplelist(context);
-/*continuing to unbounded code: notinbed from eden:5-6*/
-notinbed:
- return;
- return;
}
void malefan(Context &context) {