[Scummvm-cvs-logs] scummvm master -> 2ab06a6aae149fd0dd32cb9568d94da0cfa1ea2a
tramboi
bertrand_augereau at yahoo.fr
Sun Dec 4 22:28:23 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:
2ab06a6aae DREAMWEB: 'nextSymbol' ported to C++
Commit: 2ab06a6aae149fd0dd32cb9568d94da0cfa1ea2a
https://github.com/scummvm/scummvm/commit/2ab06a6aae149fd0dd32cb9568d94da0cfa1ea2a
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-04T16:27:44-08:00
Commit Message:
DREAMWEB: 'nextSymbol' 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 e69185d..10d79db 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -344,6 +344,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'namestoold',
'neterror',
'nextfolder',
+ 'nextsymbol',
'obicons',
'obname',
'obpicture',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f66cef4..9515f04 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -8877,23 +8877,6 @@ void DreamGenContext::dumpSymbol() {
multiDump();
}
-void DreamGenContext::nextSymbol() {
- STACK_CHECK;
- _inc(al);
- _cmp(al, 6);
- if (flags.z())
- goto topwrap;
- _cmp(al, 12);
- if (flags.z())
- goto botwrap;
- return;
-topwrap:
- al = 0;
- return;
-botwrap:
- al = 6;
-}
-
void DreamGenContext::updateSymbolTop() {
STACK_CHECK;
_cmp(data.byte(kSymboltopdir), 0);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 132d16d..4128073 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -674,7 +674,6 @@ public:
void runIntroSeq();
void nextColon();
void attendant();
- void nextSymbol();
void monks2text();
void clearPalette();
void cantDrop();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index ea1f487..aa8450d 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -3120,25 +3120,28 @@ void DreamGenContext::readDestIcon() {
loadIntoTemp3("DREAMWEB.G08");
}
+uint8 DreamGenContext::nextSymbol(uint8 symbol) {
+ uint8 result = symbol + 1;
+ if (result == 6)
+ return 0;
+ if (result == 12)
+ return 6;
+ return result;
+}
+
void DreamGenContext::showSymbol() {
showFrame(tempGraphics(), kSymbolx, kSymboly, 12, 0);
showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx-44, kSymboly+20, data.byte(kSymboltopnum), 32);
- al = data.byte(kSymboltopnum);
- nextSymbol();
- uint8 nextTopSymbol = al;
+ uint8 nextTopSymbol = nextSymbol(data.byte(kSymboltopnum));
showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx+5, kSymboly+20, nextTopSymbol, 32);
- nextSymbol();
- uint8 nextNextTopSymbol = al;
+ uint8 nextNextTopSymbol = nextSymbol(nextTopSymbol);
showFrame(tempGraphics(), data.byte(kSymboltopx) + kSymbolx+54, kSymboly+20, nextNextTopSymbol, 32);
showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx-44, kSymboly+49, 6 + data.byte(kSymbolbotnum), 32);
- al = data.byte(kSymbolbotnum);
- nextSymbol();
- uint8 nextBotSymbol = al;
+ uint8 nextBotSymbol = nextSymbol(data.byte(kSymbolbotnum));
showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx+5, kSymboly+49, 6 + nextBotSymbol, 32);
- nextSymbol();
- uint8 nextNextBotSymbol = al;
+ uint8 nextNextBotSymbol = nextSymbol(nextBotSymbol);
showFrame(tempGraphics(), data.byte(kSymbolbotx) + kSymbolx+54, kSymboly+49, 6 + nextNextBotSymbol, 32);
}
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index f403afe..5b47d32 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -409,6 +409,7 @@
void loadKeypad();
void showKeypad();
void showOuterPad();
+ uint8 nextSymbol(uint8 symbol);
void showSymbol();
void showExit();
void showMan();
More information about the Scummvm-git-logs
mailing list