[Scummvm-cvs-logs] scummvm master -> 1c9a3e7da1b9e3adb0189dfb60347d31d21415b7
bluegr
md5 at scummvm.org
Wed Dec 7 00:52:56 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:
8b4a1625ea DREAMWEB: Added a C++ implementation of isSetObOnMap()
1c9a3e7da1 DREAMWEB: 'dumpkeypad', 'dumpsymbol', 'dumpsymbox', 'dumpzoom'
Commit: 8b4a1625ea4e6d77ab4ce7654e936ab165b3d112
https://github.com/scummvm/scummvm/commit/8b4a1625ea4e6d77ab4ce7654e936ab165b3d112
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-06T15:51:11-08:00
Commit Message:
DREAMWEB: Added a C++ implementation of isSetObOnMap()
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 6b1257c..ddbff9f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -353,6 +353,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'isitdescribed',
'isitright',
'isitworn',
+ 'issetobonmap',
'kernchars',
'lastdest',
'lastfolder',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 9d85a47..c1a611e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -5987,17 +5987,6 @@ void DreamGenContext::findPuzText() {
si = ax;
}
-void DreamGenContext::isSetObOnMap() {
- STACK_CHECK;
- push(es);
- push(bx);
- getSetAd();
- al = es.byte(bx+58);
- bx = pop();
- es = pop();
- _cmp(al, 0);
-}
-
void DreamGenContext::placeFreeObject() {
STACK_CHECK;
push(es);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 878af2e..7d1b469 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -720,7 +720,6 @@ public:
void openFileNoCheck();
void checkInside();
void findPathOfPoint();
- void isSetObOnMap();
void getDestInfo();
void setupTimedUse();
void makeCaps();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 243e164..af1250a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3821,4 +3821,12 @@ void DreamGenContext::moreTalk() {
doSomeTalk();
}
+bool DreamGenContext::isSetObOnMap(uint8 index) {
+ return (getSetAd(index)->mapad[0] == 0);
+}
+
+void DreamGenContext::isSetObOnMap() {
+ flags._z = isSetObOnMap(al);
+}
+
} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 8b4ede2..f91d849 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -572,5 +572,7 @@
void putBackObStuff();
void moreTalk();
void redes();
+ void isSetObOnMap();
+ bool isSetObOnMap(uint8 index);
#endif
Commit: 1c9a3e7da1b9e3adb0189dfb60347d31d21415b7
https://github.com/scummvm/scummvm/commit/1c9a3e7da1b9e3adb0189dfb60347d31d21415b7
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-06T15:51:12-08:00
Commit Message:
DREAMWEB: 'dumpkeypad', 'dumpsymbol', 'dumpsymbox', 'dumpzoom'
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.h
engines/dreamweb/vgagrafx.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index ddbff9f..95f9974 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -247,12 +247,16 @@ generator = cpp(context, "DreamGen", blacklist = [
'drunk',
'dumpblink',
'dumpeverything',
+ 'dumpkeypad',
'dumpmap',
'dumpmenu',
'dumppointer',
+ 'dumpsymbol',
+ 'dumpsymbox',
'dumptextline',
'dumptimedtext',
'dumpwatch',
+ 'dumpzoom',
'eden',
'edeninbath',
'edenscdplayer',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c1a611e..9ee1685 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6328,15 +6328,6 @@ doqk:
data.byte(kGetback) = 1;
}
-void DreamGenContext::dumpKeypad() {
- STACK_CHECK;
- di = (36+112)-3;
- bx = (72)-4;
- cl = 120;
- ch = 90;
- multiDump();
-}
-
void DreamGenContext::quitSymbol() {
STACK_CHECK;
_cmp(data.byte(kSymboltopx), 24);
@@ -6364,16 +6355,6 @@ doqs:
data.byte(kGetback) = 1;
}
-void DreamGenContext::dumpSymbol() {
- STACK_CHECK;
- data.byte(kNewtextline) = 0;
- di = (64);
- bx = (56)+20;
- cl = 104;
- ch = 60;
- multiDump();
-}
-
void DreamGenContext::updateSymbolTop() {
STACK_CHECK;
_cmp(data.byte(kSymboltopdir), 0);
@@ -6462,19 +6443,6 @@ notwrapbackb:
data.byte(kSymbolbotdir) = 0;
}
-void DreamGenContext::dumpSymBox() {
- STACK_CHECK;
- _cmp(data.word(kDumpx), -1);
- if (flags.z())
- return /* (nodumpsym) */;
- di = data.word(kDumpx);
- bx = data.word(kDumpy);
- cl = 30;
- ch = 77;
- multiDump();
- data.word(kDumpx) = -1;
-}
-
void DreamGenContext::useDiary() {
STACK_CHECK;
getRidOfReels();
@@ -8008,18 +7976,6 @@ void DreamGenContext::getUnderZoom() {
multiGet();
}
-void DreamGenContext::dumpZoom() {
- STACK_CHECK;
- _cmp(data.byte(kZoomon), 1);
- if (!flags.z())
- return /* (notzoomon) */;
- di = (8)+5;
- bx = (132)+4;
- cl = 46;
- ch = 40;
- multiDump();
-}
-
void DreamGenContext::putUnderZoom() {
STACK_CHECK;
di = (8)+5;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7d1b469..0c3bf80 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -581,8 +581,6 @@ public:
void showDiary();
void outOfOpen();
void dirCom();
- void dumpKeypad();
- void dumpZoom();
void endGameSeq();
void findFirstPath();
void useSLab();
@@ -632,7 +630,6 @@ public:
void vSync();
void findInvPos();
void workoutFrames();
- void dumpSymBox();
void rollEndCredits();
void interviewer();
void getKeyAndLogo();
@@ -646,7 +643,6 @@ public:
void introMagic2();
void introMagic3();
void showDiaryPage();
- void dumpSymbol();
void transferToEx();
void reExFromInv();
void examineInventory();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f91d849..8dc7e60 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -574,5 +574,9 @@
void redes();
void isSetObOnMap();
bool isSetObOnMap(uint8 index);
+ void dumpKeypad();
+ void dumpSymbol();
+ void dumpSymBox();
+ void dumpZoom();
#endif
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 3e1d97e..1e678d0 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -497,4 +497,25 @@ void DreamGenContext::createPanel2() {
showFrame(engine->icons2(), 160, 0, 5, 2);
}
+void DreamGenContext::dumpKeypad() {
+ multiDump((36 + 112) - 3, 72 - 4, 120, 90);
+}
+
+void DreamGenContext::dumpSymbol() {
+ data.byte(kNewtextline) = 0;
+ multiDump(64, 56 + 20, 104, 60);
+}
+
+void DreamGenContext::dumpZoom() {
+ if (data.byte(kZoomon) == 1)
+ multiDump(8 + 5, 132 + 4, 46, 40);
+}
+
+void DreamGenContext::dumpSymBox() {
+ if (data.word(kDumpx) != 0xFFFF) {
+ multiDump(data.word(kDumpx), data.word(kDumpy), 30, 77);
+ data.word(kDumpx) = 0xFFFF;
+ }
+}
+
} // End of namespace DreamGen
More information about the Scummvm-git-logs
mailing list