[Scummvm-cvs-logs] scummvm master -> 270eb8773c0ba4b57ac4038e25aa5b60b2c9c3f8
tramboi
bertrand_augereau at yahoo.fr
Thu Dec 1 15:25:42 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:
ed30ee8e38 DREAMWEB: 'othersmoker' ported to C++ (and 'barwoman' removed)
270eb8773c DREAMWEB: 'drinker' ported to C++
Commit: ed30ee8e383150f40f92250524befc018c364687
https://github.com/scummvm/scummvm/commit/ed30ee8e383150f40f92250524befc018c364687
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-01T04:25:31-08:00
Commit Message:
DREAMWEB: 'othersmoker' ported to C++ (and 'barwoman' removed)
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/sprite.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 1705a4e..124ec8f 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -336,6 +336,8 @@ generator = cpp(context, "DreamGen", blacklist = [
'worktoscreenm',
'checkspeed',
'sparkydrip',
+ 'othersmoker',
+ 'barwoman',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b98726e..8143c8f 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -322,18 +322,6 @@ notgotgun:
addtopeoplelist();
}
-void DreamGenContext::othersmoker() {
- STACK_CHECK;
- showgamereel();
- addtopeoplelist();
-}
-
-void DreamGenContext::barwoman() {
- STACK_CHECK;
- showgamereel();
- addtopeoplelist();
-}
-
void DreamGenContext::interviewer() {
STACK_CHECK;
_cmp(data.word(kReeltowatch), 68);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 51acfd7..0e472e2 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -469,8 +469,6 @@ public:
static const uint16 addr_rockstar = 0xc058;
static const uint16 addr_soldier1 = 0xc054;
static const uint16 addr_interviewer = 0xc050;
- static const uint16 addr_barwoman = 0xc04c;
- static const uint16 addr_othersmoker = 0xc048;
static const uint16 addr_bartender = 0xc044;
static const uint16 addr_drinker = 0xc040;
static const uint16 addr_tattooman = 0xc03c;
@@ -1150,7 +1148,6 @@ public:
void intromonks2();
void advisor();
void additionaltext();
- void othersmoker();
void dofade();
void useelevator5();
void useelevator4();
@@ -1477,7 +1474,6 @@ public:
void searchforfiles();
void monkspeaking();
void clearrest();
- void barwoman();
void credits();
void madmanrun();
void randomnum1();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 9043409..584fa18 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -578,7 +578,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
&DreamGenContext::bossman, &DreamGenContext::interviewer,
&DreamGenContext::heavy, &DreamGenContext::manasleep2,
&DreamGenContext::mansatstill, &DreamGenContext::drinker,
- &DreamGenContext::bartender, &DreamGenContext::othersmoker,
+ &DreamGenContext::bartender, NULL,
&DreamGenContext::tattooman, &DreamGenContext::attendant,
&DreamGenContext::keeper, &DreamGenContext::candles1,
&DreamGenContext::smallcandle, &DreamGenContext::security,
@@ -600,35 +600,35 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
};
static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
- NULL, &DreamGenContext::sparkydrip,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL, NULL,
- NULL
+ /*&DreamGenContext::gamer*/NULL, &DreamGenContext::sparkydrip,
+ /*&DreamGenContext::eden*/NULL, /*&DreamGenContext::edeninbath*/NULL,
+ /*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL,
+ /*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL,
+ /*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL,
+ /*&DreamGenContext::femalefan*/NULL, /*&DreamGenContext::louis*/NULL,
+ /*&DreamGenContext::louischair*/NULL, /*&DreamGenContext::soldier1*/NULL,
+ /*&DreamGenContext::bossman*/NULL, /*&DreamGenContext::interviewer*/NULL,
+ /*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manasleep2*/NULL,
+ /*&DreamGenContext::mansatstill*/NULL, /*&DreamGenContext::drinker*/NULL,
+ /*&DreamGenContext::bartender*/NULL, &DreamGenContext::othersmoker,
+ /*&DreamGenContext::tattooman*/NULL, /*&DreamGenContext::attendant*/NULL,
+ /*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
+ /*&DreamGenContext::smallcandle*/NULL, /*&DreamGenContext::security*/NULL,
+ /*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolguard*/NULL,
+ /*&DreamGenContext::rockstar*/NULL, /*&DreamGenContext::businessman*/NULL,
+ /*&DreamGenContext::train*/NULL, /*&DreamGenContext::aide*/NULL,
+ /*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
+ /*&DreamGenContext::intromagic1*/NULL, /*&DreamGenContext::intromusic*/NULL,
+ /*&DreamGenContext::intromagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
+ /*&DreamGenContext::gates*/NULL, /*&DreamGenContext::intromagic3*/NULL,
+ /*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL,
+ /*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handclap*/NULL,
+ /*&DreamGenContext::monkandryan*/NULL, /*&DreamGenContext::endgameseq*/NULL,
+ /*&DreamGenContext::priest*/NULL, /*&DreamGenContext::madman*/NULL,
+ /*&DreamGenContext::madmanstelly*/NULL, /*&DreamGenContext::alleybarksound*/NULL,
+ /*&DreamGenContext::foghornsound*/NULL, /*&DreamGenContext::carparkdrip*/NULL,
+ /*&DreamGenContext::carparkdrip*/NULL, /*&DreamGenContext::carparkdrip*/NULL,
+ /*&DreamGenContext::carparkdrip*/NULL
};
void DreamGenContext::updatepeople() {
@@ -1082,5 +1082,10 @@ void DreamGenContext::sparkydrip(ReelRoutine &routine) {
playchannel0(14, 0);
}
+void DreamGenContext::othersmoker(ReelRoutine &routine) {
+ showgamereel(&routine);
+ addtopeoplelist(&routine);
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 9f7bce4..1512c30 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -378,4 +378,5 @@
bool checkspeed(ReelRoutine *routine);
void checkspeed();
void sparkydrip(ReelRoutine &routine);
+ void othersmoker(ReelRoutine &routine);
Commit: 270eb8773c0ba4b57ac4038e25aa5b60b2c9c3f8
https://github.com/scummvm/scummvm/commit/270eb8773c0ba4b57ac4038e25aa5b60b2c9c3f8
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-01T06:23:38-08:00
Commit Message:
DREAMWEB: 'drinker' ported to C++
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/sprite.cpp
engines/dreamweb/stubs.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 124ec8f..bdb58a5 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -338,6 +338,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'sparkydrip',
'othersmoker',
'barwoman',
+ 'gamer',
], skip_output = [
# These functions are processed but not output
'dreamweb',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8143c8f..260e6d5 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -908,28 +908,6 @@ notboss:
data.byte(kTalkedtoboss) = 1;
}
-void DreamGenContext::gamer() {
- STACK_CHECK;
- checkspeed();
- if (!flags.z())
- goto gamerfin;
-gameragain:
- randomnum1();
- _and(al, 7);
- _cmp(al, 5);
- if (!flags.c())
- goto gameragain;
- _add(al, 20);
- _cmp(al, es.byte(bx+3));
- if (flags.z())
- goto gameragain;
- ah = 0;
- es.word(bx+3) = ax;
-gamerfin:
- showgamereel();
- addtopeoplelist();
-}
-
void DreamGenContext::carparkdrip() {
STACK_CHECK;
checkspeed();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 0e472e2..a5fba4d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -457,7 +457,6 @@ public:
static const uint16 addr_candles1 = 0xc08c;
static const uint16 addr_keeper = 0xc088;
static const uint16 addr_carparkdrip = 0xc084;
- static const uint16 addr_gamer = 0xc07c;
static const uint16 addr_bossman = 0xc078;
static const uint16 addr_heavy = 0xc074;
static const uint16 addr_security = 0xc070;
@@ -1363,7 +1362,6 @@ public:
void afterintroroom();
void buttonnine();
void findallopen();
- void gamer();
void readfromfile();
void initialinv();
void quitsymbol();
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 584fa18..f8c865d 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -568,7 +568,7 @@ void DreamGenContext::showrain() {
}
static void (DreamGenContext::*reelCallbacks[57])() = {
- &DreamGenContext::gamer, NULL,
+ NULL, NULL,
&DreamGenContext::eden, &DreamGenContext::edeninbath,
&DreamGenContext::sparky, &DreamGenContext::smokebloke,
&DreamGenContext::manasleep, &DreamGenContext::drunk,
@@ -600,7 +600,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
};
static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
- /*&DreamGenContext::gamer*/NULL, &DreamGenContext::sparkydrip,
+ &DreamGenContext::gamer, &DreamGenContext::sparkydrip,
/*&DreamGenContext::eden*/NULL, /*&DreamGenContext::edeninbath*/NULL,
/*&DreamGenContext::sparky*/NULL, /*&DreamGenContext::smokebloke*/NULL,
/*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL,
@@ -1087,5 +1087,18 @@ void DreamGenContext::othersmoker(ReelRoutine &routine) {
addtopeoplelist(&routine);
}
+void DreamGenContext::gamer(ReelRoutine &routine) {
+ if (checkspeed(&routine)) {
+ uint8 v;
+ do {
+ v = 20 + engine->randomNumber() % 5;
+ } while (v == routine.reelPointer());
+ routine.setReelPointer(v);
+ }
+
+ showgamereel(&routine);
+ addtopeoplelist(&routine);
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 1512c30..b1f2b8a 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -379,4 +379,5 @@
void checkspeed();
void sparkydrip(ReelRoutine &routine);
void othersmoker(ReelRoutine &routine);
+ void gamer(ReelRoutine &routine);
More information about the Scummvm-git-logs
mailing list