[Scummvm-cvs-logs] scummvm master -> ea62c23256b110b8800fb013a325c474a19c5912
tramboi
bertrand_augereau at yahoo.fr
Sun Nov 20 16:45:23 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
36c4bafdc1 DREAMWEB: 'powerlighton' and 'powerlightoff' ported to C++
ea62c23256 DREAMWEB: 'turnonpower' ported to C++
Commit: 36c4bafdc172b78f8f2213dff3b06462387029aa
https://github.com/scummvm/scummvm/commit/36c4bafdc172b78f8f2213dff3b06462387029aa
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-20T09:44:39-08:00
Commit Message:
DREAMWEB: 'powerlighton' and 'powerlightoff' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/monitor.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 31ce367..8223bc3 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -253,6 +253,8 @@ generator = cpp(context, "DreamGen", blacklist = [
'monmessage',
'neterror',
'randomaccess',
+ 'powerlighton',
+ 'powerlightoff',
'accesslighton',
'accesslightoff',
], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index dda6367..6d9ab41 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6096,40 +6096,6 @@ powerloop:
powerlighton();
}
-void DreamGenContext::powerlighton() {
- STACK_CHECK;
- di = 257+4;
- bx = 182;
- ds = data.word(kTempgraphics);
- al = 6;
- ah = 0;
- push(di);
- push(bx);
- showframe();
- bx = pop();
- di = pop();
- cl = 12;
- ch = 8;
- multidump();
-}
-
-void DreamGenContext::powerlightoff() {
- STACK_CHECK;
- di = 257+4;
- bx = 182;
- ds = data.word(kTempgraphics);
- al = 5;
- ah = 0;
- push(di);
- push(bx);
- showframe();
- bx = pop();
- di = pop();
- cl = 12;
- ch = 8;
- multidump();
-}
-
void DreamGenContext::locklighton() {
STACK_CHECK;
di = 56;
@@ -15150,8 +15116,6 @@ void DreamGenContext::__dispatch_call(uint16 addr) {
case addr_loadcart: loadcart(); break;
case addr_lookininterface: lookininterface(); break;
case addr_turnonpower: turnonpower(); break;
- case addr_powerlighton: powerlighton(); break;
- case addr_powerlightoff: powerlightoff(); 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 e4e42e2..78df0d5 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -358,8 +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_powerlightoff = 0xc50c;
- static const uint16 addr_powerlighton = 0xc508;
static const uint16 addr_turnonpower = 0xc500;
static const uint16 addr_lookininterface = 0xc4fc;
static const uint16 addr_loadcart = 0xc4f8;
@@ -1317,7 +1315,6 @@ public:
void showdiary();
//void loadroomssample();
//void updatepeople();
- //void addtopeoplelist();
//void hangoncurs();
//void getblockofpixel();
//void kernchars();
@@ -1327,6 +1324,7 @@ public:
//void dealwithspecial();
//void eraseoldobs();
void dircom();
+ //void powerlighton();
//void liftsprite();
void dumpkeypad();
void showsymbol();
@@ -1587,7 +1585,7 @@ public:
void setkeyboardint();
void priest();
//void readmouse();
- void powerlighton();
+ //void addtopeoplelist();
void savefilewrite();
void printmessage2();
//void showallfree();
@@ -1716,7 +1714,7 @@ public:
//void showrain();
void useopened();
void inventory();
- void powerlightoff();
+ //void powerlightoff();
void fillopen();
//void showoutermenu();
void signon();
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 5372981..a569c11 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -247,5 +247,15 @@ void DreamGenContext::neterror() {
scrollmonitor();
}
+void DreamGenContext::powerlighton() {
+ showframe(tempGraphics(), 257+4, 182, 6, 0);
+ multidump(257+4, 182, 12, 8);
+}
+
+void DreamGenContext::powerlightoff() {
+ showframe(tempGraphics(), 257+4, 182, 5, 0);
+ multidump(257+4, 182, 12, 8);
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1cfeab3..fafc14e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -315,4 +315,6 @@
void monmessage(uint8 index);
void monmessage();
void neterror();
+ void powerlighton();
+ void powerlightoff();
Commit: ea62c23256b110b8800fb013a325c474a19c5912
https://github.com/scummvm/scummvm/commit/ea62c23256b110b8800fb013a325c474a19c5912
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-20T09:44:39-08:00
Commit Message:
DREAMWEB: 'turnonpower' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/monitor.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 8223bc3..020e388 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -253,6 +253,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'monmessage',
'neterror',
'randomaccess',
+ 'turnonpower',
'powerlighton',
'powerlightoff',
'accesslighton',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6d9ab41..d60a13b 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 78df0d5..af5ac88 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 a569c11..c09b715 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 fafc14e..2babc89 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();
More information about the Scummvm-git-logs
mailing list