[Scummvm-cvs-logs] scummvm master -> 3b5794890fb36d0d93e8eff7d1a30c9bfd611618
tramboi
bertrand_augereau at yahoo.fr
Mon Dec 5 22:04:48 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:
4f9e3dcb79 DREAMWEB: 'introMusic' ported to C++
3b5794890f DREAMWEB: Ported 'candles' to C++
Commit: 4f9e3dcb79b462c5e05f510d82030e537efe1356
https://github.com/scummvm/scummvm/commit/4f9e3dcb79b462c5e05f510d82030e537efe1356
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-05T15:51:10-08:00
Commit Message:
DREAMWEB: 'introMusic' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/people.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index f253f23..4fa0150 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -310,6 +310,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'input',
'intro',
'intromagic1',
+ 'intromusic',
'inventory',
'isitdescribed',
'isitright',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 995cd8f..c099e82 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -44,10 +44,6 @@ nobark:
es.word(bx+3) = ax;
}
-void DreamGenContext::introMusic() {
- STACK_CHECK;
-}
-
void DreamGenContext::foghornSound() {
STACK_CHECK;
randomNumber();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4bd1e85..f30c8e6 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -690,7 +690,6 @@ public:
void errorMessage3();
void introMagic2();
void introMagic3();
- void edenInBath();
void showDiaryPage();
void useShield();
void getBackToOps();
@@ -699,7 +698,7 @@ public:
void transferToEx();
void reExFromInv();
void examineInventory();
- void useDryer();
+ void businessMan();
void outOfInv();
void diaryKeyP();
void transferMap();
@@ -826,6 +825,7 @@ public:
void openFile();
void showPuzText();
void incRyanPage();
+ void edenInBath();
void findExObject();
void clearChanges();
void useChurchHole();
@@ -875,12 +875,11 @@ public:
void emergencyPurge();
void alleyBarkSound();
void useCart();
- void introMusic();
void quitKey();
void processTrigger();
void volumeAdjust();
void transferConToEx();
- void businessMan();
+ void useDryer();
void adjustDown();
void withWhat();
void openOb();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index 508228a..b1f509d 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -43,7 +43,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
NULL, &DreamGenContext::businessMan,
&DreamGenContext::train, NULL,
&DreamGenContext::mugger, &DreamGenContext::helicopter,
- NULL, &DreamGenContext::introMusic,
+ NULL, NULL,
&DreamGenContext::introMagic2, &DreamGenContext::candles2,
&DreamGenContext::gates, &DreamGenContext::introMagic3,
&DreamGenContext::introMonks1, &DreamGenContext::candles,
@@ -75,7 +75,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
/*&DreamGenContext::train*/NULL, &DreamGenContext::genericPerson /*aide*/,
/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
- &DreamGenContext::introMagic1, /*&DreamGenContext::introMusic*/NULL,
+ &DreamGenContext::introMagic1, &DreamGenContext::introMusic,
/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
/*&DreamGenContext::gates*/NULL, /*&DreamGenContext::introMagic3*/NULL,
/*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL,
@@ -375,6 +375,9 @@ void DreamGenContext::introMagic1(ReelRoutine &routine) {
showGameReel(&routine);
}
+void DreamGenContext::introMusic(ReelRoutine &routine) {
+}
+
void DreamGenContext::security(ReelRoutine &routine) {
if (routine.reelPointer() == 32) {
if (data.byte(kLastweapon) == 1) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 29a6460..ac2fd40 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -411,6 +411,7 @@
void manAsleep(ReelRoutine &routine);
void drunk(ReelRoutine &routine);
void introMagic1(ReelRoutine &routine);
+ void introMusic(ReelRoutine &routine);
void security(ReelRoutine &routine);
void singleKey(uint8 key, uint16 x, uint16 y);
void loadSaveBox();
Commit: 3b5794890fb36d0d93e8eff7d1a30c9bfd611618
https://github.com/scummvm/scummvm/commit/3b5794890fb36d0d93e8eff7d1a30c9bfd611618
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-05T16:02:04-08:00
Commit Message:
DREAMWEB: Ported 'candles' to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/people.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 4fa0150..1e56984 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -178,6 +178,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'calcmapad',
'cancelch0',
'cancelch1',
+ 'candles',
'channel0only',
'channel0tran',
'channel1only',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index c099e82..fca8abc 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -785,23 +785,6 @@ smallcandlef:
showGameReel();
}
-void DreamGenContext::candles() {
- STACK_CHECK;
- checkSpeed();
- if (!flags.z())
- goto candlesfin;
- ax = es.word(bx+3);
- _inc(ax);
- _cmp(ax, 167);
- if (!flags.z())
- goto gotcandles;
- ax = 162;
-gotcandles:
- es.word(bx+3) = ax;
-candlesfin:
- showGameReel();
-}
-
void DreamGenContext::candles2() {
STACK_CHECK;
checkSpeed();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f30c8e6..39af176 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -541,6 +541,7 @@ public:
void useWire();
void getNamePos();
+ void clearChanges();
void identifyOb();
void useLighter();
void runEndSeq();
@@ -609,14 +610,12 @@ public:
void findFirstPath();
void useSLab();
void useAltar();
- void manAsleep2();
void moreTalk();
void startTalk();
void getAnyAd();
void endGame();
void usePipe();
void getUnderZoom();
- void candles();
void rollEndCredits2();
void reminders();
void selectSlot2();
@@ -827,7 +826,7 @@ public:
void incRyanPage();
void edenInBath();
void findExObject();
- void clearChanges();
+ void manAsleep2();
void useChurchHole();
void searchForFiles();
void monkSpeaking();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index b1f509d..e69fd66 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -46,7 +46,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
NULL, NULL,
&DreamGenContext::introMagic2, &DreamGenContext::candles2,
&DreamGenContext::gates, &DreamGenContext::introMagic3,
- &DreamGenContext::introMonks1, &DreamGenContext::candles,
+ &DreamGenContext::introMonks1, NULL,
&DreamGenContext::introMonks2, &DreamGenContext::handClap,
&DreamGenContext::monkAndRyan, &DreamGenContext::endGameSeq,
&DreamGenContext::priest, NULL,
@@ -78,7 +78,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
/*&DreamGenContext::gates*/NULL, /*&DreamGenContext::introMagic3*/NULL,
- /*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL,
+ /*&DreamGenContext::intromonks1*/NULL, &DreamGenContext::candles,
/*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handClap*/NULL,
/*&DreamGenContext::monkAndRyan*/NULL, /*&DreamGenContext::endGameSeq*/NULL,
/*&DreamGenContext::priest*/NULL, &DreamGenContext::madman,
@@ -378,6 +378,16 @@ void DreamGenContext::introMagic1(ReelRoutine &routine) {
void DreamGenContext::introMusic(ReelRoutine &routine) {
}
+void DreamGenContext::candles(ReelRoutine &routine) {
+ if (checkSpeed(routine)) {
+ uint16 nextReelPointer = routine.reelPointer() + 1;
+ if (nextReelPointer == 167)
+ nextReelPointer = 162;
+ routine.setReelPointer(nextReelPointer);
+ }
+ showGameReel(&routine);
+}
+
void DreamGenContext::security(ReelRoutine &routine) {
if (routine.reelPointer() == 32) {
if (data.byte(kLastweapon) == 1) {
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ac2fd40..b9f2fed 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -412,6 +412,7 @@
void drunk(ReelRoutine &routine);
void introMagic1(ReelRoutine &routine);
void introMusic(ReelRoutine &routine);
+ void candles(ReelRoutine &routine);
void security(ReelRoutine &routine);
void singleKey(uint8 key, uint16 x, uint16 y);
void loadSaveBox();
More information about the Scummvm-git-logs
mailing list