[Scummvm-cvs-logs] scummvm master -> 18da47dcd63d244a6d1a59e02acb05e4812542af
bluegr
md5 at scummvm.org
Mon Dec 12 18:17:34 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:
18da47dcd6 DREAMWEB: Port 'quitkey' to C++
Commit: 18da47dcd63d244a6d1a59e02acb05e4812542af
https://github.com/scummvm/scummvm/commit/18da47dcd63d244a6d1a59e02acb05e4812542af
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-12T09:16:56-08:00
Commit Message:
DREAMWEB: Port 'quitkey' 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 7f7b245..7c89ab4 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -608,6 +608,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'putunderzoom',
'quickquit',
'quickquit2',
+ 'quitkey',
'quitsymbol',
'random',
'randomaccess',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 6aad4f0..6d3da6d 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -4730,27 +4730,6 @@ nottvsoldier:
putBackObStuff();
}
-void DreamGenContext::quitKey() {
- STACK_CHECK;
- _cmp(data.byte(kCommandtype), 222);
- if (flags.z())
- goto alreadyqk;
- data.byte(kCommandtype) = 222;
- al = 4;
- commandOnly();
-alreadyqk:
- ax = data.word(kMousebutton);
- _cmp(ax, data.word(kOldbutton));
- if (flags.z())
- return /* (notqk) */;
- _and(ax, 1);
- if (!flags.z())
- goto doqk;
- return;
-doqk:
- data.byte(kGetback) = 1;
-}
-
void DreamGenContext::updateSymbolTop() {
STACK_CHECK;
_cmp(data.byte(kSymboltopdir), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 7d01158..ae9bf3b 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -606,7 +606,6 @@ public:
void getPersonText();
void parser();
void emergencyPurge();
- void quitKey();
void processTrigger();
void transferConToEx();
void adjustDown();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 90aca9c..162152c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4307,4 +4307,14 @@ void DreamGenContext::autoAppear() {
}
}
+void DreamGenContext::quitKey() {
+ if (data.byte(kCommandtype) != 222) {
+ data.byte(kCommandtype) = 222;
+ commandOnly(4);
+ }
+
+ if (data.word(kMousebutton) != data.word(kOldbutton) && (data.word(kMousebutton) & 1))
+ data.byte(kGetback) = 1;
+}
+
} // End of namespace DreamGen
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 52cb3a3..4308bd5 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -567,5 +567,6 @@
void rollEndCredits2();
void useButtonA();
void autoAppear();
+ void quitKey();
#endif
More information about the Scummvm-git-logs
mailing list