[Scummvm-cvs-logs] scummvm master -> 5cd91fbf73635dd92d046b5ae70e19cf4e1a47d0
tramboi
bertrand_augereau at yahoo.fr
Tue Nov 29 18:24:47 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:
eb296fc9e0 DREAMWEB: 'foldertext' ported to C++
5cd91fbf73 DREAMWEB: 'loadfolder' ported to C++
Commit: eb296fc9e0e00d816cce5912bffdb6e2689b93d0
https://github.com/scummvm/scummvm/commit/eb296fc9e0e00d816cce5912bffdb6e2689b93d0
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-29T09:10:41-08:00
Commit Message:
DREAMWEB: 'foldertext' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 713dc13..dab9dfb 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -308,6 +308,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'nextfolder',
'lastfolder',
'folderhints',
+ 'folderexit',
'getlocation',
'setlocation',
], skip_output = [
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 753e151..40cd84e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9754,16 +9754,6 @@ void DreamGenContext::loadfolder() {
loadtemptext();
}
-void DreamGenContext::folderexit() {
- STACK_CHECK;
- ds = data.word(kTempgraphics2);
- di = 296;
- bx = 178;
- al = 6;
- ah = 0;
- showframe();
-}
-
void DreamGenContext::entersymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 13841c8..3faae24 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -176,7 +176,6 @@ public:
static const uint16 addr_settopleft = 0xc7e0;
static const uint16 addr_quitsymbol = 0xc7dc;
static const uint16 addr_entersymbol = 0xc7d8;
- static const uint16 addr_folderexit = 0xc7cc;
static const uint16 addr_loadfolder = 0xc7c4;
static const uint16 addr_loadmenu = 0xc7b0;
static const uint16 addr_showmenu = 0xc7ac;
@@ -1156,7 +1155,7 @@ public:
void loadfolder();
void dumpdiarykeys();
//void dumppointer();
- void bossman();
+ //void look();
void getridofreels();
void readkey();
void louis();
@@ -1440,7 +1439,6 @@ public:
//void quickquit();
//void showpointer();
void usecooker();
- //void look();
void loadmenu();
void checkforemm();
//void checkifpathison();
@@ -1480,6 +1478,7 @@ public:
//void pixelcheckset();
void reexfrominv();
void examinventory();
+ //void folderexit();
void getridoftemp3();
void usedryer();
//void dumpeverything();
@@ -1547,7 +1546,7 @@ public:
void describeob();
void deleteexframe();
//void readsetdata();
- void folderexit();
+ void bossman();
void dosreturn();
void wheelsound();
//void actualsave();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index e6a3213..17f762d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2485,5 +2485,9 @@ void DreamGenContext::folderhints() {
}
}
+void DreamGenContext::folderexit() {
+ showframe(tempGraphics2(), 296, 178, 6, 0);
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f175d52..bffa07a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -362,6 +362,7 @@
void nextfolder();
void lastfolder();
void folderhints();
+ void folderexit();
uint8 getlocation(uint8 index);
void getlocation();
void setlocation(uint8 index);
Commit: 5cd91fbf73635dd92d046b5ae70e19cf4e1a47d0
https://github.com/scummvm/scummvm/commit/5cd91fbf73635dd92d046b5ae70e19cf4e1a47d0
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-29T09:10:44-08:00
Commit Message:
DREAMWEB: 'loadfolder' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index dab9dfb..fbc10e3 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -302,6 +302,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'restorereels',
'allocateload',
'viewfolder',
+ 'loadfolder',
'showfolder',
'showleftpage',
'showrightpage',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 40cd84e..225f0af 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9740,20 +9740,6 @@ void DreamGenContext::loadmenu() {
loadintotemp2();
}
-void DreamGenContext::loadfolder() {
- STACK_CHECK;
- dx = 2299;
- loadintotemp();
- dx = 2312;
- loadintotemp2();
- dx = 2325;
- loadintotemp3();
- dx = 1883;
- loadtempcharset();
- dx = 2195;
- loadtemptext();
-}
-
void DreamGenContext::entersymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 3faae24..67740e8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -176,7 +176,6 @@ public:
static const uint16 addr_settopleft = 0xc7e0;
static const uint16 addr_quitsymbol = 0xc7dc;
static const uint16 addr_entersymbol = 0xc7d8;
- static const uint16 addr_loadfolder = 0xc7c4;
static const uint16 addr_loadmenu = 0xc7b0;
static const uint16 addr_showmenu = 0xc7ac;
static const uint16 addr_dumpmenu = 0xc79c;
@@ -1152,7 +1151,7 @@ public:
void removeemm();
//void frameoutbh();
void getobtextstart();
- void loadfolder();
+ //void loadfolder();
void dumpdiarykeys();
//void dumppointer();
//void look();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 17f762d..fa3b59d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2306,6 +2306,15 @@ void DreamGenContext::restorereels() {
closefile();
}
+void DreamGenContext::loadfolder() {
+ loadintotemp("DREAMWEB.G09");
+ loadintotemp2("DREAMWEB.G10");
+ loadintotemp3("DREAMWEB.G11");
+ loadtempcharset("DREAMWEB.C02");
+ dx = kFoldertext; // "DREAMWEB.T50"
+ loadtemptext();
+}
+
void DreamGenContext::showfolder() {
data.byte(kCommandtype) = 255;
if (data.byte(kFolderpage)) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bffa07a..16be8ee 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -356,6 +356,7 @@
void restorereels();
void viewfolder();
void checkFolderCoords();
+ void loadfolder();
void showfolder();
void showleftpage();
void showrightpage();
More information about the Scummvm-git-logs
mailing list