aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdevtools/tasmrecover/tasm-recover3
-rw-r--r--engines/dreamweb/dreamgen.cpp17
-rw-r--r--engines/dreamweb/dreamgen.h3
-rw-r--r--engines/dreamweb/stubs.cpp24
-rw-r--r--engines/dreamweb/stubs.h2
5 files changed, 20 insertions, 29 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index a962305275..5e39e64a91 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -152,6 +152,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'allocatebuffers',
'allocateload',
'allocatework',
+ 'allpointer',
'animpointer',
'atmospheres',
'autolook',
@@ -159,6 +160,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'backobject',
'barwoman',
'biblequote',
+ 'blank',
'blockget',
'blocknametext',
'bothchannels',
@@ -384,6 +386,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'manasleep',
'mansatstill',
'maptopanel',
+ 'mode640x480',
'modifychar',
'monmessage',
'monprint',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 50a0d3bc9f..c64e2f9ef3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9653,23 +9653,6 @@ void DreamGenContext::middlePanel() {
showFrame();
}
-void DreamGenContext::blank() {
- STACK_CHECK;
- _cmp(data.byte(kCommandtype), 199);
- if (flags.z())
- return /* (alreadyblnk) */;
- data.byte(kCommandtype) = 199;
- al = 0;
- commandOnly();
-}
-
-void DreamGenContext::allPointer() {
- STACK_CHECK;
- readMouse();
- showPointer();
- dumpPointer();
-}
-
void DreamGenContext::getUnderZoom() {
STACK_CHECK;
di = (8)+5;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f8968c2313..ba8d645ed7 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -643,7 +643,6 @@ public:
void cantDrop();
void copper();
void openHotelDoor();
- void blank();
void drinker();
void nextColon();
void placeFreeObject();
@@ -799,7 +798,6 @@ public:
void initialMonCols();
void checkForShake();
void useButtonA();
- void mode640x480();
void openEden();
void execCommand();
void obsThatDoThings();
@@ -812,7 +810,6 @@ public:
void makeMainScreen();
void useWinch();
void updateSymbolTop();
- void allPointer();
void checkSoundInt();
void doSaveLoad();
void createName();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index fa0a3b0bc6..b05b554d7a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1121,13 +1121,6 @@ void DreamGenContext::DOSReturn() {
void DreamGenContext::set16ColPalette() {
}
-void DreamGenContext::mode640x480() {
- // Video mode 12h: 640x480 pixels, 16 colors, I believe
- al = 0x12 + 128;
- ah = 0;
- initGraphics(640, 480, true);
-}
-
void DreamGenContext::showGroup() {
engine->setPalette();
}
@@ -3141,7 +3134,7 @@ void DreamGenContext::hangOne() {
}
void DreamGenContext::bibleQuote() {
- mode640x480();
+ initGraphics(640, 480, true);
showPCX("DREAMWEB.I00");
fadeScreenUps();
@@ -3176,7 +3169,7 @@ void DreamGenContext::realCredits() {
loadRoomsSample();
data.byte(kVolume) = 0;
- mode640x480();
+ initGraphics(640, 480, true);
hangOn(35);
showPCX("DREAMWEB.I01");
@@ -3578,5 +3571,18 @@ void DreamGenContext::selectSlot2() {
data.byte(kLoadingorsave) = 2;
}
+void DreamGenContext::blank() {
+ if (data.byte(kCommandtype) != 199) {
+ data.byte(kCommandtype) = 199;
+ commandOnly(0);
+ }
+}
+
+void DreamGenContext::allPointer() {
+ readMouse();
+ showPointer();
+ dumpPointer();
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 94a30b0463..046e7bd961 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -511,5 +511,7 @@
void gettingShot();
void redrawMainScrn();
void selectSlot2();
+ void blank();
+ void allPointer();
#endif