[Scummvm-cvs-logs] scummvm master -> a72832d054e2a4e56f17055189fc06a02c3473a4
bluegr
md5 at scummvm.org
Wed Dec 7 09:42:45 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:
3962bcb2d6 DREAMWEB: 'manasleep2' ported to C++ (same as 'manasleep')
a72832d054 DREAMWEB: 'attendant', 'keeper' ported to C++
Commit: 3962bcb2d62b954306c0492703ebdb9dceaa87bd
https://github.com/scummvm/scummvm/commit/3962bcb2d62b954306c0492703ebdb9dceaa87bd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-07T00:41:30-08:00
Commit Message:
DREAMWEB: 'manasleep2' ported to C++ (same as 'manasleep')
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/people.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 95f9974..5b56602 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -405,6 +405,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'makeworn',
'malefan',
'manasleep',
+ 'manasleep2',
'mansatstill',
'maptopanel',
'mode640x480',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 9ee1685..8b755d6 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -136,15 +136,6 @@ notlouisanim:
addToPeopleList();
}
-void DreamGenContext::manAsleep2() {
- STACK_CHECK;
- al = es.byte(bx+7);
- _and(al, 127);
- es.byte(bx+7) = al;
- showGameReel();
- addToPeopleList();
-}
-
void DreamGenContext::drinker() {
STACK_CHECK;
checkSpeed();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 0c3bf80..f917002 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -639,7 +639,6 @@ public:
void selectSlot();
void fadeUpMon();
void soundEnd();
- void manAsleep2();
void introMagic2();
void introMagic3();
void showDiaryPage();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index ed04a54..fcb257c 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -33,7 +33,7 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
NULL, NULL,
&DreamGenContext::louisChair, &DreamGenContext::soldier1,
&DreamGenContext::bossMan, &DreamGenContext::interviewer,
- &DreamGenContext::heavy, &DreamGenContext::manAsleep2,
+ &DreamGenContext::heavy, NULL,
NULL, &DreamGenContext::drinker,
&DreamGenContext::bartender, NULL,
NULL, &DreamGenContext::attendant,
@@ -65,7 +65,7 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
&DreamGenContext::genericPerson /*femaleFan*/, &DreamGenContext::louis,
/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
- /*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
+ /*&DreamGenContext::heavy*/NULL, &DreamGenContext::manAsleep /*manAsleep2*/,
&DreamGenContext::genericPerson /*manSatStill*/, /*&DreamGenContext::drinker*/NULL,
/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
&DreamGenContext::genericPerson /*tattooMan*/, /*&DreamGenContext::attendant*/NULL,
Commit: a72832d054e2a4e56f17055189fc06a02c3473a4
https://github.com/scummvm/scummvm/commit/a72832d054e2a4e56f17055189fc06a02c3473a4
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-07T00:41:31-08:00
Commit Message:
DREAMWEB: 'attendant', 'keeper' 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 5b56602..37f3bb4 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -155,6 +155,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'allpointer',
'animpointer',
'atmospheres',
+ 'attendant',
'autolook',
'autosetwalk',
'backobject',
@@ -358,6 +359,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'isitright',
'isitworn',
'issetobonmap',
+ 'keeper',
'kernchars',
'lastdest',
'lastfolder',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 8b755d6..b54dc63 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -93,17 +93,6 @@ gotrecep:
data.byte(kTalkedtorecep) = 1;
}
-void DreamGenContext::attendant() {
- STACK_CHECK;
- showGameReel();
- addToPeopleList();
- al = es.byte(bx+7);
- _and(al, 128);
- if (flags.z())
- return /* (nottalked) */;
- data.byte(kTalkedtoattendant) = 1;
-}
-
void DreamGenContext::louisChair() {
STACK_CHECK;
_cmp(data.byte(kRockstardead), 0);
@@ -680,28 +669,6 @@ notboss:
data.byte(kTalkedtoboss) = 1;
}
-void DreamGenContext::keeper() {
- STACK_CHECK;
- _cmp(data.byte(kKeeperflag), 0);
- if (!flags.z())
- goto notwaiting;
- _cmp(data.word(kReeltowatch), 190);
- if (flags.c())
- return /* (waiting) */;
- _inc(data.byte(kKeeperflag));
- ah = es.byte(bx+7);
- _and(ah, 127);
- _cmp(ah, data.byte(kDreamnumber));
- if (flags.z())
- return /* (notdiff) */;
- al = data.byte(kDreamnumber);
- es.byte(bx+7) = al;
- return;
-notwaiting:
- addToPeopleList();
- showGameReel();
-}
-
void DreamGenContext::candles1() {
STACK_CHECK;
checkSpeed();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f917002..9b5a798 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -620,7 +620,6 @@ public:
void runIntroSeq();
void advisor();
void allPalette();
- void attendant();
void cantDrop();
void copper();
void drinker();
@@ -735,7 +734,6 @@ public:
void monkSpeaking();
void clearRest();
void madmanRun();
- void keeper();
void afterNewRoom();
void getExAd();
void closeFile();
diff --git a/engines/dreamweb/people.cpp b/engines/dreamweb/people.cpp
index fcb257c..41b4fa3 100644
--- a/engines/dreamweb/people.cpp
+++ b/engines/dreamweb/people.cpp
@@ -36,8 +36,8 @@ static void (DreamGenContext::*reelCallbacks[57])() = {
&DreamGenContext::heavy, NULL,
NULL, &DreamGenContext::drinker,
&DreamGenContext::bartender, NULL,
- NULL, &DreamGenContext::attendant,
- &DreamGenContext::keeper, &DreamGenContext::candles1,
+ NULL, NULL,
+ NULL, &DreamGenContext::candles1,
&DreamGenContext::smallCandle, NULL,
&DreamGenContext::copper, &DreamGenContext::poolGuard,
NULL, &DreamGenContext::businessMan,
@@ -68,8 +68,8 @@ static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
/*&DreamGenContext::heavy*/NULL, &DreamGenContext::manAsleep /*manAsleep2*/,
&DreamGenContext::genericPerson /*manSatStill*/, /*&DreamGenContext::drinker*/NULL,
/*&DreamGenContext::bartender*/NULL, &DreamGenContext::genericPerson /*otherSmoker*/,
- &DreamGenContext::genericPerson /*tattooMan*/, /*&DreamGenContext::attendant*/NULL,
- /*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
+ &DreamGenContext::genericPerson /*tattooMan*/, &DreamGenContext::attendant,
+ &DreamGenContext::keeper, /*&DreamGenContext::candles1*/NULL,
/*&DreamGenContext::smallcandle*/NULL, &DreamGenContext::security,
/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolGuard*/NULL,
&DreamGenContext::rockstar, /*&DreamGenContext::businessMan*/NULL,
@@ -344,6 +344,29 @@ void DreamGenContext::manAsleep(ReelRoutine &routine) {
addToPeopleList(&routine);
}
+void DreamGenContext::attendant(ReelRoutine &routine) {
+ showGameReel(&routine);
+ addToPeopleList(&routine);
+ if (routine.b7 & 128)
+ data.byte(kTalkedtoattendant) = 1;
+}
+
+void DreamGenContext::keeper(ReelRoutine &routine) {
+ if (data.byte(kKeeperflag) != 0) {
+ // Not waiting
+ addToPeopleList(&routine);
+ showGameReel(&routine);
+ return;
+ }
+
+ if (data.word(kReeltowatch) < 190)
+ return; // waiting
+
+ data.byte(kKeeperflag)++;
+
+ if (routine.b7 & 127 != data.byte(kDreamnumber))
+ routine.b7 = data.byte(kDreamnumber);
+}
void DreamGenContext::drunk(ReelRoutine &routine) {
if (data.byte(kGeneraldead))
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 8dc7e60..7b5e33e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -456,6 +456,8 @@
void carParkDrip(ReelRoutine &routine);
void foghornSound(ReelRoutine &routine);
void train(ReelRoutine &routine);
+ void attendant(ReelRoutine &routine);
+ void keeper(ReelRoutine &routine);
void singleKey(uint8 key, uint16 x, uint16 y);
void loadSaveBox();
void loadKeypad();
More information about the Scummvm-git-logs
mailing list