[Scummvm-cvs-logs] scummvm master -> 33b5c9e0401eefc9b668b3e0d26549d0949f7288
bluegr
md5 at scummvm.org
Mon Dec 12 16:04:38 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:
273fc3ff1a DREAMWEB: Port 'usebuttona' to C++
33b5c9e040 DREAMWEB: Silence signed/unsigned warning
Commit: 273fc3ff1a0ed8b1d1140bb5225ad77e07cb08d7
https://github.com/scummvm/scummvm/commit/273fc3ff1a0ed8b1d1140bb5225ad77e07cb08d7
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-12T06:55:32-08:00
Commit Message:
DREAMWEB: Port 'usebuttona' to C++
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 5558a93..c35edbf 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -750,6 +750,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'undertextline',
'updatepeople',
'usebalcony',
+ 'usebuttona',
'usecardreader1',
'usecardreader2',
'usecardreader3',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8d1eb4c..fbe02df 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4849,34 +4849,6 @@ nottvsoldier:
putBackObStuff();
}
-void DreamGenContext::useButtonA() {
- STACK_CHECK;
- al = 95;
- isSetObOnMap();
- if (flags.z())
- goto donethisbit;
- showFirstUse();
- al = 0;
- ah = data.byte(kRoomnum);
- _dec(ah);
- turnAnyPathOn();
- al = 9;
- removeSetObject();
- al = 95;
- placeSetObject();
- data.word(kWatchingtime) = 15*2;
- data.word(kReeltowatch) = 71;
- data.word(kEndwatchreel) = 85;
- data.byte(kWatchspeed) = 1;
- data.byte(kSpeedcount) = 1;
- data.byte(kGetback) = 1;
- _inc(data.byte(kProgresspoints));
- return;
-donethisbit:
- showSecondUse();
- putBackObStuff();
-}
-
void DreamGenContext::quitKey() {
STACK_CHECK;
_cmp(data.byte(kCommandtype), 222);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 04c5116..eff4ecf 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -610,7 +610,6 @@ public:
void searchForFiles();
void getExAd();
void initialMonCols();
- void useButtonA();
void execCommand();
void updateSymbolBot();
void findPuzText();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 0b3daa8..71a6834 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4242,4 +4242,24 @@ void DreamGenContext::monkSpeaking() {
getRidOfTemp();
}
+void DreamGenContext::useButtonA() {
+ if (!isSetObOnMap(95)) {
+ showFirstUse();
+ turnAnyPathOn(0, data.byte(kRoomnum) - 1);
+ removeSetObject(9);
+ placeSetObject(95);
+ data.word(kWatchingtime) = 15 * 2;
+ data.word(kReeltowatch) = 71;
+ data.word(kEndwatchreel) = 85;
+ data.byte(kWatchspeed) = 1;
+ data.byte(kSpeedcount) = 1;
+ data.byte(kGetback) = 1;
+ data.byte(kProgresspoints)++;
+ } else {
+ // Done this bit
+ showSecondUse();
+ putBackObStuff();
+ }
+}
+
} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4e9dbb8..4efcc3c 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -564,5 +564,6 @@
void showPuzText();
void monkSpeaking();
void rollEndCredits2();
+ void useButtonA();
#endif
Commit: 33b5c9e0401eefc9b668b3e0d26549d0949f7288
https://github.com/scummvm/scummvm/commit/33b5c9e0401eefc9b668b3e0d26549d0949f7288
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-12T06:56:01-08:00
Commit Message:
DREAMWEB: Silence signed/unsigned warning
Changed paths:
engines/dreamweb/sprite.cpp
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 0d25618..e93a77f 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -763,7 +763,7 @@ void DreamBase::rollEndCredits() {
playChannel0(16, 255);
data.byte(kVolume) = 7;
data.byte(kVolumeto) = 0;
- data.byte(kVolumedirection) = -1;
+ data.byte(kVolumedirection) = 0xFF;
multiGet(mapStore(), 75, 20, 160, 160);
More information about the Scummvm-git-logs
mailing list