aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdevtools/tasmrecover/tasm-recover3
-rw-r--r--engines/dreamweb/dreambase.h1
-rw-r--r--engines/dreamweb/dreamgen.cpp58
-rw-r--r--engines/dreamweb/dreamgen.h3
-rw-r--r--engines/dreamweb/stubs.cpp17
-rw-r--r--engines/dreamweb/stubs.h2
6 files changed, 23 insertions, 61 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 8d5ad953d5..5f0fc1576d 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -596,9 +596,11 @@ generator = cpp(context, "DreamGen", blacklist = [
'showicon',
'showkeypad',
'showleftpage',
+ 'showloadops',
'showmainops',
'showman',
'showmenu',
+ 'showopbox',
'showoutermenu',
'showouterpad',
'showpanel',
@@ -608,6 +610,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'showreelframe',
'showrightpage',
'showryanpage',
+ 'showsaveops',
'showseconduse',
'showsymbol',
'showtime',
diff --git a/engines/dreamweb/dreambase.h b/engines/dreamweb/dreambase.h
index c0ca7c864e..e56018d0db 100644
--- a/engines/dreamweb/dreambase.h
+++ b/engines/dreamweb/dreambase.h
@@ -89,6 +89,7 @@ public:
Frame *tempGraphics2();
Frame *tempGraphics3();
void showArrows();
+ void showOpBox();
// from vgafades.cpp
uint8 *mainPalette();
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b8bdbe6291..81b1f2900e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6256,64 +6256,6 @@ void DreamGenContext::getNamePos() {
_add(bx, ax);
}
-void DreamGenContext::showOpBox() {
- STACK_CHECK;
- ds = data.word(kTempgraphics);
- di = (60);
- bx = (52);
- al = 0;
- ah = 0;
- showFrame();
- ds = data.word(kTempgraphics);
- di = (60);
- bx = (52)+55;
- al = 4;
- ah = 0;
- showFrame();
-}
-
-void DreamGenContext::showLoadOps() {
- STACK_CHECK;
- ds = data.word(kTempgraphics);
- di = (60)+128+4;
- bx = (52)+12;
- al = 1;
- ah = 0;
- showFrame();
- ds = data.word(kTempgraphics);
- di = (60)+176+2;
- bx = (52)+60-4;
- al = 5;
- ah = 0;
- showFrame();
- di = (60)+104;
- bx = (52)+14;
- al = 55;
- dl = 101;
- printMessage();
-}
-
-void DreamGenContext::showSaveOps() {
- STACK_CHECK;
- ds = data.word(kTempgraphics);
- di = (60)+128+4;
- bx = (52)+12;
- al = 1;
- ah = 0;
- showFrame();
- ds = data.word(kTempgraphics);
- di = (60)+176+2;
- bx = (52)+60-4;
- al = 5;
- ah = 0;
- showFrame();
- di = (60)+104;
- bx = (52)+14;
- al = 54;
- dl = 101;
- printMessage();
-}
-
void DreamGenContext::selectSlot() {
STACK_CHECK;
_cmp(data.byte(kCommandtype), 244);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b7ec416221..7a6b384257 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -561,7 +561,6 @@ public:
void useCashCard();
void moneyPoke();
void doSomeTalk();
- void showSaveOps();
void introMonks1();
void resetLocation();
void introMonks2();
@@ -660,7 +659,6 @@ public:
void openOb();
void drawItAll();
void useStereo();
- void showOpBox();
void dumpCurrent();
void showDiaryKeys();
void rollEndCredits2();
@@ -711,7 +709,6 @@ public:
void createName();
void getPersonText();
void parser();
- void showLoadOps();
void underTextLine();
void showNames();
void emergencyPurge();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index cc5d04b107..2fdb1420b4 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3785,4 +3785,21 @@ void DreamBase::showArrows() {
showFrame(tempGraphics(), 280, 14, 2, 0);
}
+void DreamBase::showOpBox() {
+ showFrame(tempGraphics(), kOpsx, kOpsy, 0, 0);
+ showFrame(tempGraphics(), kOpsx, kOpsy + 55, 4, 0);
+}
+
+void DreamGenContext::showLoadOps() {
+ showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+ showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 5, 0);
+ printMessage(kOpsx + 104, kOpsy + 14, 55, 101, (101 & 1));
+}
+
+void DreamGenContext::showSaveOps() {
+ showFrame(tempGraphics(), kOpsx + 128 + 4, kOpsy + 12, 1, 0);
+ showFrame(tempGraphics(), kOpsx + 176 + 2, kOpsy + 60 - 4, 6, 0);
+ printMessage(kOpsx + 104, kOpsy + 14, 54, 101, (101 & 1));
+}
+
} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 937dac1f64..e8969f2dc0 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -553,5 +553,7 @@
void getTime();
void set16ColPalette();
void examineInventory();
+ void showSaveOps();
+ void showLoadOps();
#endif