[Scummvm-cvs-logs] scummvm master -> 6f6d137726d8d80f158f92ff5d8f868a0df267dd
bluegr
md5 at scummvm.org
Sun Dec 11 20:47:30 CET 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6f6d137726 DREAMWEB: Port 'uselighter' to C++
Commit: 6f6d137726d8d80f158f92ff5d8f868a0df267dd
https://github.com/scummvm/scummvm/commit/6f6d137726d8d80f158f92ff5d8f868a0df267dd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-11T11:46:17-08:00
Commit Message:
DREAMWEB: Port 'uselighter' to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.h
engines/dreamweb/use.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f6e99e8..e34b00c 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -737,6 +737,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'usehole',
'useladder',
'useladderb',
+ 'uselighter',
'usehatch',
'usemenu',
'usemon',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index de0ac54..c8d31f7 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4125,36 +4125,6 @@ void DreamGenContext::drawItAll() {
showIcon();
}
-void DreamGenContext::useLighter() {
- STACK_CHECK;
- _cmp(data.byte(kWithobject), 255);
- if (!flags.z())
- goto gotlighterwith;
- withWhat();
- return;
-gotlighterwith:
- al = data.byte(kWithobject);
- ah = data.byte(kWithtype);
- cl = 'S';
- ch = 'M';
- dl = 'K';
- dh = 'E';
- compare();
- if (flags.z())
- goto cigarette;
- showFirstUse();
- putBackObStuff();
- return;
-cigarette:
- cx = 300;
- al = 9;
- showPuzText();
- al = data.byte(kWithobject);
- getExAd();
- es.byte(bx+2) = 255;
- data.byte(kGetback) = 1;
-}
-
void DreamGenContext::useCashCard() {
STACK_CHECK;
getRidOfReels();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 848bd53..b61a980 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -526,7 +526,6 @@ public:
void useWire();
void identifyOb();
- void useLighter();
void runEndSeq();
void useOpenBox();
void clearBuffers();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index e9e642c..e0b9b3e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -333,6 +333,7 @@
void useRailing();
void useWindow();
void useHatch();
+ void useLighter();
void wheelSound();
void callHotelLift();
void useShield();
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index 68f4aed..9126b7e 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -1116,6 +1116,26 @@ void DreamGenContext::useCardReader3() {
}
}
+void DreamGenContext::useLighter() {
+ if (data.byte(kWithobject) == 255) {
+ withWhat();
+ return;
+ }
+
+ char id[4] = { 'S', 'M', 'K', 'E' }; // TODO: convert to string with trailing zero
+ if (!compare(data.byte(kWithobject), data.byte(kWithtype), id)) {
+ showFirstUse();
+ putBackObStuff();
+ } else {
+ cx = 300;
+ al = 9;
+ showPuzText();
+ getExAd(data.byte(kWithobject));
+ es.byte(bx + 2) = 255;
+ data.byte(kGetback) = 1;
+ }
+}
+
void DreamGenContext::openTomb() {
data.byte(kProgresspoints)++;
showFirstUse();
More information about the Scummvm-git-logs
mailing list