aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-11-14 20:18:18 +0100
committerWillem Jan Palenstijn2011-11-14 21:43:36 +0100
commite254e549293b8b13e8d1765b553a448e73169de9 (patch)
tree060f5d23bcda6879232a9a4b3ad2d35c9f47de44 /engines
parent36278dccded41106e242b28810b13a5d702cc72a (diff)
downloadscummvm-rg350-e254e549293b8b13e8d1765b553a448e73169de9.tar.gz
scummvm-rg350-e254e549293b8b13e8d1765b553a448e73169de9.tar.bz2
scummvm-rg350-e254e549293b8b13e8d1765b553a448e73169de9.zip
DREAMWEB: Convert 'mainscreen'
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/stubs.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index fed7a39863..767db2b0da 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1919,19 +1919,17 @@ void DreamGenContext::showcity() {
}
void DreamGenContext::mainscreen() {
- STACK_CHECK;
data.byte(kInmaparea) = 0;
- bx = offset_mainlist;
- _cmp(data.byte(kWatchon), 1);
- if (flags.z())
- goto checkmain;
- bx = offset_mainlist2;
-checkmain:
- checkcoords();
- _cmp(data.byte(kWalkandexam), 0);
- if (flags.z())
- return /* (finishmain) */;
- walkandexamine();
+ if (data.byte(kWatchon) == 1) {
+ bx = offset_mainlist;
+ checkcoords();
+ } else {
+ bx = offset_mainlist2;
+ checkcoords();
+ }
+
+ if (data.byte(kWalkandexam) != 0)
+ walkandexamine();
}