aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorBertrand Augereau2011-11-20 18:42:12 +0100
committerBertrand Augereau2011-11-20 18:44:39 +0100
commitea62c23256b110b8800fb013a325c474a19c5912 (patch)
tree220e4380267f6910ef01a407ffbf0ed7e9ab7cfc /engines
parent36c4bafdc172b78f8f2213dff3b06462387029aa (diff)
downloadscummvm-rg350-ea62c23256b110b8800fb013a325c474a19c5912.tar.gz
scummvm-rg350-ea62c23256b110b8800fb013a325c474a19c5912.tar.bz2
scummvm-rg350-ea62c23256b110b8800fb013a325c474a19c5912.zip
DREAMWEB: 'turnonpower' ported to C++
Diffstat (limited to 'engines')
-rw-r--r--engines/dreamweb/dreamgen.cpp18
-rw-r--r--engines/dreamweb/dreamgen.h5
-rw-r--r--engines/dreamweb/monitor.cpp11
-rw-r--r--engines/dreamweb/stubs.h1
4 files changed, 14 insertions, 21 deletions
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6d9ab4189f..d60a13b75b 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6079,23 +6079,6 @@ emptyinterface:
al = 0;
}
-void DreamGenContext::turnonpower() {
- STACK_CHECK;
- cx = 3;
-powerloop:
- push(cx);
- powerlighton();
- cx = 30;
- hangon();
- powerlightoff();
- cx = 30;
- hangon();
- cx = pop();
- if (--cx)
- goto powerloop;
- powerlighton();
-}
-
void DreamGenContext::locklighton() {
STACK_CHECK;
di = 56;
@@ -15115,7 +15098,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
case addr_loadnews: loadnews(); break;
case addr_loadcart: loadcart(); break;
case addr_lookininterface: lookininterface(); break;
- case addr_turnonpower: turnonpower(); break;
case addr_locklighton: locklighton(); break;
case addr_locklightoff: locklightoff(); break;
case addr_makecaps: makecaps(); break;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 78df0d59a0..af5ac88852 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -358,7 +358,6 @@ public:
static const uint16 addr_makecaps = 0xc524;
static const uint16 addr_locklightoff = 0xc51c;
static const uint16 addr_locklighton = 0xc518;
- static const uint16 addr_turnonpower = 0xc500;
static const uint16 addr_lookininterface = 0xc4fc;
static const uint16 addr_loadcart = 0xc4f8;
static const uint16 addr_loadnews = 0xc4f4;
@@ -1330,7 +1329,7 @@ public:
void showsymbol();
void endgameseq();
//void cancelch0();
- void turnonpower();
+ void setbotleft();
void findfirstpath();
//void cancelch1();
void loadold();
@@ -1340,7 +1339,7 @@ public:
//void aboutturn();
void usealtar();
void createpanel2();
- void setbotleft();
+ //void turnonpower();
void manasleep2();
void moretalk();
//void printslow();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index a569c116bf..c09b7150b6 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -257,5 +257,16 @@ void DreamGenContext::powerlightoff() {
multidump(257+4, 182, 12, 8);
}
+void DreamGenContext::turnonpower() {
+ for (size_t i = 0; i < 3; ++i) {
+ powerlighton();
+ hangon(30);
+ powerlightoff();
+ hangon(30);
+ }
+ powerlighton();
+}
+
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index fafc14eb8e..2babc891ce 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -315,6 +315,7 @@
void monmessage(uint8 index);
void monmessage();
void neterror();
+ void turnonpower();
void powerlighton();
void powerlightoff();