diff options
author | Filippos Karapetis | 2011-12-07 01:42:35 +0200 |
---|---|---|
committer | Filippos Karapetis | 2011-12-07 01:51:11 +0200 |
commit | 8b4a1625ea4e6d77ab4ce7654e936ab165b3d112 (patch) | |
tree | 0526633dec2c44d363123fce5226d145e38daea9 | |
parent | 54c4bac556ff96c44e81816faa35bee87c91e57a (diff) | |
download | scummvm-rg350-8b4a1625ea4e6d77ab4ce7654e936ab165b3d112.tar.gz scummvm-rg350-8b4a1625ea4e6d77ab4ce7654e936ab165b3d112.tar.bz2 scummvm-rg350-8b4a1625ea4e6d77ab4ce7654e936ab165b3d112.zip |
DREAMWEB: Added a C++ implementation of isSetObOnMap()
-rwxr-xr-x | devtools/tasmrecover/tasm-recover | 1 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.cpp | 11 | ||||
-rw-r--r-- | engines/dreamweb/dreamgen.h | 1 | ||||
-rw-r--r-- | engines/dreamweb/stubs.cpp | 8 | ||||
-rw-r--r-- | engines/dreamweb/stubs.h | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index 6b1257ca26..ddbff9f0d6 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 9d85a47e3b..c1a611edb8 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 878af2e060..7d1b469b66 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 243e164982..af1250af48 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 8b4ede2d0d..f91d849ece 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 |