[Scummvm-cvs-logs] scummvm master -> e287ac0e39324d2149633d080780bf2b57ccf3d2
bluegr
md5 at scummvm.org
Thu Dec 8 20:55:45 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:
e287ac0e39 DREAMWEB: Port 'afternewroom' to C++
Commit: e287ac0e39324d2149633d080780bf2b57ccf3d2
https://github.com/scummvm/scummvm/commit/e287ac0e39324d2149633d080780bf2b57ccf3d2
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-08T11:54:58-08:00
Commit Message:
DREAMWEB: Port 'afternewroom' 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 08471f3..ecc6b92 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -154,6 +154,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'adjustlen',
'advisor',
'afterintroroom',
+ 'afternewroom',
'aide',
'alleybarksound',
'allocatebuffers',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index ab4d8cb..65d8d4a 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -6781,45 +6781,6 @@ gotfirst:
al = es.byte(bx+6);
}
-void DreamGenContext::afterNewRoom() {
- STACK_CHECK;
- _cmp(data.byte(kNowinnewroom), 0);
- if (flags.z())
- return /* (notnew) */;
- data.word(kTimecount) = 0;
- createPanel();
- data.byte(kCommandtype) = 0;
- findRoomInLoc();
- _cmp(data.byte(kRyanon), 1);
- if (flags.z())
- goto ryansoff;
- al = data.byte(kRyanx);
- _add(al, 12);
- ah = data.byte(kRyany);
- _add(ah, 12);
- findPathOfPoint();
- data.byte(kManspath) = dl;
- findXYFromPath();
- data.byte(kResetmanxy) = 1;
-ryansoff:
- data.byte(kNewobs) = 1;
- drawFloor();
- data.word(kLookcounter) = 160;
- data.byte(kNowinnewroom) = 0;
- showIcon();
- spriteUpdate();
- printSprites();
- underTextLine();
- reelsOnScreen();
- mainScreen();
- getUnderZoom();
- zoom();
- workToScreenM();
- walkIntoRoom();
- reminders();
- atmospheres();
-}
-
void DreamGenContext::printmessage2() {
STACK_CHECK;
push(dx);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 2b55387..5e0523d 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -680,7 +680,6 @@ public:
void searchForFiles();
void monkSpeaking();
void madmanRun();
- void afterNewRoom();
void getExAd();
void initialMonCols();
void useButtonA();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 9d3719f..674ea21 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3865,4 +3865,38 @@ void DreamGenContext::watchReel() {
plotReel(reelPointer);
}
+void DreamGenContext::afterNewRoom() {
+ if (data.byte(kNowinnewroom) == 0)
+ return; // notnew
+
+ data.word(kTimecount) = 0;
+ createPanel();
+ data.byte(kCommandtype) = 0;
+ findRoomInLoc();
+ if (data.byte(kRyanon) != 1) {
+ al = data.byte(kRyanx) + 12;
+ ah = data.byte(kRyany) + 12;
+ findPathOfPoint();
+ data.byte(kManspath) = dl;
+ findXYFromPath();
+ data.byte(kResetmanxy) = 1;
+ }
+ data.byte(kNewobs) = 1;
+ drawFloor();
+ data.word(kLookcounter) = 160;
+ data.byte(kNowinnewroom) = 0;
+ showIcon();
+ spriteUpdate();
+ printSprites();
+ underTextLine();
+ reelsOnScreen();
+ mainScreen();
+ getUnderZoom();
+ zoom();
+ workToScreenM();
+ walkIntoRoom();
+ reminders();
+ atmospheres();
+}
+
} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index cfebddd..582109f 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -548,5 +548,6 @@
void removeFreeObject(uint8 index) {
DreamBase::removeFreeObject(index);
}
+ void afterNewRoom();
#endif
More information about the Scummvm-git-logs
mailing list