[Scummvm-cvs-logs] scummvm master -> 658fe0aa106603a662cbb6ccd382e5a89ecf1142
tramboi
bertrand_augereau at yahoo.fr
Wed Nov 23 16:26:18 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:
658fe0aa10 DREAMWEB: 'look' ported to C++
Commit: 658fe0aa106603a662cbb6ccd382e5a89ecf1142
https://github.com/scummvm/scummvm/commit/658fe0aa106603a662cbb6ccd382e5a89ecf1142
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-11-23T07:25:38-08:00
Commit Message:
DREAMWEB: 'look' 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 1d5264f..c4946db 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -272,6 +272,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'createpanel',
'createpanel2',
'findroominloc',
+ 'look',
'autolook',
'reelsonscreen',
'reconstruct',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 34fa14c..0a69411 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4894,31 +4894,6 @@ void DreamGenContext::drawfloor() {
es = pop();
}
-void DreamGenContext::look() {
- STACK_CHECK;
- _cmp(data.word(kWatchingtime), 0);
- if (!flags.z())
- { blank(); return; };
- _cmp(data.byte(kPointermode), 2);
- if (flags.z())
- { blank(); return; };
- _cmp(data.byte(kCommandtype), 241);
- if (flags.z())
- goto alreadylook;
- data.byte(kCommandtype) = 241;
- al = 25;
- commandonly();
-alreadylook:
- _cmp(data.word(kMousebutton), 1);
- if (!flags.z())
- return /* (nolook) */;
- ax = data.word(kMousebutton);
- _cmp(ax, data.word(kOldbutton));
- if (flags.z())
- return /* (nolook) */;
- dolook();
-}
-
void DreamGenContext::dolook() {
STACK_CHECK;
createpanel();
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 606961c..462a2b0 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -377,7 +377,6 @@ public:
static const uint16 addr_getback1 = 0xc47c;
static const uint16 addr_redrawmainscrn = 0xc478;
static const uint16 addr_dolook = 0xc474;
- static const uint16 addr_look = 0xc470;
static const uint16 addr_drawfloor = 0xc428;
static const uint16 addr_deleteextext = 0xc420;
static const uint16 addr_deleteexframe = 0xc41c;
@@ -1477,6 +1476,7 @@ public:
//void quickquit();
//void showpointer();
void usecooker();
+ //void look();
void loadmenu();
void checkforemm();
//void checkifpathison();
@@ -1662,7 +1662,7 @@ public:
//void showcurrentfile();
//void turnpathoff();
//void copyname();
- void look();
+ //void madmantext();
void setmouse();
//void checkone();
//void transferinv();
@@ -1682,7 +1682,6 @@ public:
void dmaend();
//void quickquit2();
//void twodigitnum();
- //void madmantext();
void dumpcurrent();
//void textforend();
void showdiarykeys();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index bd3439a..60fdf5d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2274,5 +2274,18 @@ void DreamGenContext::autolook() {
dolook();
}
+void DreamGenContext::look() {
+ if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
+ blank();
+ return;
+ }
+ if (data.byte(kCommandtype) != 241) {
+ data.byte(kCommandtype) = 241;
+ commandonly(25);
+ }
+ if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton)))
+ dolook();
+}
+
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 39d1758..42acc88 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -332,5 +332,6 @@
void findroominloc();
void reelsonscreen();
void reconstruct();
+ void look();
void autolook();
More information about the Scummvm-git-logs
mailing list