[Scummvm-cvs-logs] scummvm master -> 277a1c950b2927b77d0987cc85d4737787995c6e
tramboi
bertrand_augereau at yahoo.fr
Sun Dec 4 14:45:25 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:
277a1c950b DREAMWEB: 'showMan' ported to C++
Commit: 277a1c950b2927b77d0987cc85d4737787995c6e
https://github.com/scummvm/scummvm/commit/277a1c950b2927b77d0987cc85d4737787995c6e
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T07:44:00-08:00
Commit Message:
DREAMWEB: 'showMan' ported 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 a879f8d..5608ecf 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -416,6 +416,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'showkeypad',
'showleftpage',
'showmainops',
+ 'showman',
'showmenu',
'showoutermenu',
'showouterpad',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index b23ad98..685b08e 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -10867,31 +10867,6 @@ void DreamGenContext::middlePanel() {
showFrame();
}
-void DreamGenContext::showMan() {
- STACK_CHECK;
- ds = data.word(kIcons1);
- di = 0;
- bx = 0;
- al = 0;
- ah = 0;
- showFrame();
- ds = data.word(kIcons1);
- di = 0;
- bx = 114;
- al = 1;
- ah = 0;
- showFrame();
- _cmp(data.byte(kShadeson), 0);
- if (flags.z())
- return /* (notverycool) */;
- ds = data.word(kIcons1);
- di = 28;
- bx = 25;
- al = 2;
- ah = 0;
- showFrame();
-}
-
void DreamGenContext::panelIcons1() {
STACK_CHECK;
di = 0;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 33f2bdd..c053e56 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -582,7 +582,7 @@ public:
void entryTexts();
void checkInput();
void setMode();
- void getBackFromOps();
+ void showDiary();
void openSarters();
void putUnderCentre();
void checkObjectSize();
@@ -630,7 +630,7 @@ public:
void train();
void fadeDownMon();
void bartender();
- void showDiary();
+ void getBackFromOps();
void sLabDoorF();
void outOfOpen();
void dirCom();
@@ -867,7 +867,6 @@ public:
void autoAppear();
void openRyan();
void callHotelLift();
- void showMan();
void useFullCart();
void newPlace();
void loadSample();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 414c9c6..c1f8058 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2802,6 +2802,13 @@ void DreamGenContext::showExit() {
showFrame(icons1(), 274, 154, 11, 0);
}
+void DreamGenContext::showMan() {
+ showFrame(icons1(), 0, 0, 0, 0);
+ showFrame(icons1(), 0, 114, 1, 0);
+ if (data.byte(kShadeson))
+ showFrame(icons1(), 28, 25, 2, 0);
+}
+
uint8 DreamGenContext::getLocation(uint8 index) {
return data.byte(kRoomscango + index);
}
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index bc836d6..816499d 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -406,6 +406,7 @@
void showKeypad();
void showOuterPad();
void showExit();
+ void showMan();
void buttonOne();
void buttonTwo();
void buttonThree();
More information about the Scummvm-git-logs
mailing list