[Scummvm-cvs-logs] scummvm master -> d37a4ee95e3ff5beddfda4b60ad93259491b8e4c
tramboi
bertrand_augereau at yahoo.fr
Sat Dec 3 15:01:01 CET 2011
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e61cb12364 DREAMWEB: 'useMenu' ported to C++
47ffd3fed8 DREAMWEB: 'loadMenu' ported to C++
a92a4414e6 DREAMWEB: 'showMenu' ported to C++
d37a4ee95e DREAMWEB: 'dumpMenu' ported to C++
Commit: e61cb12364e44026144defe98c7d10693f363853
https://github.com/scummvm/scummvm/commit/e61cb12364e44026144defe98c7d10693f363853
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T06:59:03-08:00
Commit Message:
DREAMWEB: 'useMenu' 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 2c81eb1..2324bfd 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -254,6 +254,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'fadeupmonfirst',
'loadroomssample',
'printlogo',
+ 'usemenu',
'usemon',
'scrollmonitor',
'showcurrentfile',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d9af7a3..d014fb2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9161,54 +9161,6 @@ void DreamGenContext::dumpKeypad() {
multiDump();
}
-void DreamGenContext::useMenu() {
- STACK_CHECK;
- getRidOfReels();
- loadMenu();
- createPanel();
- showPanel();
- showIcon();
- data.byte(kNewobs) = 0;
- drawFloor();
- printSprites();
- al = 4;
- ah = 0;
- di = (80+40)-48;
- bx = (60)-4;
- ds = data.word(kTempgraphics2);
- showFrame();
- getUnderMenu();
- al = 5;
- ah = 0;
- di = (80+40)+54;
- bx = (60)+72;
- ds = data.word(kTempgraphics2);
- showFrame();
- workToScreenM();
- data.byte(kGetback) = 0;
-menuloop:
- delPointer();
- putUnderMenu();
- showMenu();
- readMouse();
- showPointer();
- vSync();
- dumpPointer();
- dumpMenu();
- dumpTextLine();
- bx = offset_menulist;
- checkCoords();
- _cmp(data.byte(kGetback), 1);
- if (!flags.z())
- goto menuloop;
- data.byte(kManisoffscreen) = 0;
- redrawMainScrn();
- getRidOfTemp();
- getRidOfTemp2();
- restoreReels();
- workToScreenM();
-}
-
void DreamGenContext::dumpMenu() {
STACK_CHECK;
di = (80+40);
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index b4596e0..f9a51ad 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -58,7 +58,6 @@ public:
static const uint16 offset_invlist1 = 0x09fc;
static const uint16 offset_money2poke = 0x0d97;
static const uint16 offset_talklist = 0x0a64;
- static const uint16 offset_menulist = 0x0e1e;
static const uint16 offset_comlist = 0x0ad8;
static const uint16 offset_withlist1 = 0x0a3a;
static const uint16 offset_money1poke = 0x0d92;
@@ -1056,7 +1055,6 @@ public:
void showNames();
void saveFileRead();
void emergencyPurge();
- void useMenu();
void alleyBarkSound();
void useCart();
void introMusic();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index edb8887..a60a39c 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -1710,15 +1710,6 @@ void DreamGenContext::checkCoords() {
checkCoords(destList);
break;
}
- case offset_menulist: {
- RectWithCallback menuList[] = {
- { kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamGenContext::quitKey },
- { 0,320,0,200,&DreamGenContext::blank },
- { 0xFFFF,0,0,0,0 }
- };
- checkCoords(menuList);
- break;
- }
case offset_symbollist: {
RectWithCallback symbolList[] = {
{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamGenContext::quitSymbol },
@@ -2735,5 +2726,43 @@ void DreamGenContext::workToScreenM() {
delPointer();
}
+void DreamGenContext::useMenu() {
+ getRidOfReels();
+ loadMenu();
+ createPanel();
+ showPanel();
+ showIcon();
+ data.byte(kNewobs) = 0;
+ drawFloor();
+ printSprites();
+ showFrame(tempGraphics2(), kMenux-48, kMenuy-4, 4, 0);
+ getUnderMenu();
+ showFrame(tempGraphics2(), kMenux+54, kMenuy+72, 5, 0);
+ workToScreenM();
+ data.byte(kGetback) = 0;
+ do {
+ delPointer();
+ putUnderMenu();
+ showMenu();
+ readMouse();
+ showPointer();
+ vSync();
+ dumpPointer();
+ dumpMenu();
+ dumpTextLine();
+ RectWithCallback menuList[] = {
+ { kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamGenContext::quitKey },
+ { 0,320,0,200,&DreamGenContext::blank },
+ { 0xFFFF,0,0,0,0 }
+ };
+ checkCoords(menuList);
+ } while ((data.byte(kGetback) != 1) && !quitRequested());
+ data.byte(kManisoffscreen) = 0;
+ redrawMainScrn();
+ getRidOfTemp();
+ getRidOfTemp2();
+ restoreReels();
+ workToScreenM();
+}
} /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6943138..6e64874 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -303,6 +303,7 @@
void fadeupYellows();
void fadeupMonFirst();
void printLogo();
+ void useMenu();
void useMon();
void scrollMonitor();
void showCurrentFile();
Commit: 47ffd3fed8307e3786e1435ca503976b5dba8831
https://github.com/scummvm/scummvm/commit/47ffd3fed8307e3786e1435ca503976b5dba8831
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T06:59:03-08:00
Commit Message:
DREAMWEB: 'loadMenu' 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 2324bfd..9d0adde 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -254,6 +254,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'fadeupmonfirst',
'loadroomssample',
'printlogo',
+ 'loadmenu',
'usemenu',
'usemon',
'scrollmonitor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index d014fb2..fe10fc2 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9187,14 +9187,6 @@ menuframeok:
showFrame();
}
-void DreamGenContext::loadMenu() {
- STACK_CHECK;
- dx = 1832;
- loadIntoTemp();
- dx = 1987;
- loadIntoTemp2();
-}
-
void DreamGenContext::enterSymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index f9a51ad..86aa288 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -737,7 +737,7 @@ public:
void getUnderZoom();
void candles();
void backObject();
- void rollEndCredits2();
+ void allocateMem();
void reminders();
void selectSlot2();
void runTap();
@@ -815,7 +815,6 @@ public:
void selectOb();
void usePlinth();
void useCooker();
- void loadMenu();
void checkForEMM();
void receptionist();
void selectSlot();
@@ -933,7 +932,7 @@ public:
void showDiaryKeys();
void dontLoadSeg();
void intro3Text();
- void allocateMem();
+ void rollEndCredits2();
void useOpened();
void inventory();
void fillOpen();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index a60a39c..8b28480 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2726,6 +2726,11 @@ void DreamGenContext::workToScreenM() {
delPointer();
}
+void DreamGenContext::loadMenu() {
+ loadIntoTemp("DREAMWEB.S02");
+ loadIntoTemp2("DREAMWEB.G07");
+}
+
void DreamGenContext::useMenu() {
getRidOfReels();
loadMenu();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 6e64874..4b2ec56 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -303,6 +303,7 @@
void fadeupYellows();
void fadeupMonFirst();
void printLogo();
+ void loadMenu();
void useMenu();
void useMon();
void scrollMonitor();
Commit: a92a4414e6731c09bd3a6ea51a8cfb541dda9a8a
https://github.com/scummvm/scummvm/commit/a92a4414e6731c09bd3a6ea51a8cfb541dda9a8a
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T06:59:04-08:00
Commit Message:
DREAMWEB: 'showMenu' 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 9d0adde..187e4d6 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -255,6 +255,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'loadroomssample',
'printlogo',
'loadmenu',
+ 'showmenu',
'usemenu',
'usemon',
'scrollmonitor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index fe10fc2..1dafee3 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9170,23 +9170,6 @@ void DreamGenContext::dumpMenu() {
multiDump();
}
-void DreamGenContext::showMenu() {
- STACK_CHECK;
- _inc(data.byte(kMenucount));
- _cmp(data.byte(kMenucount), 37*2);
- if (!flags.z())
- goto menuframeok;
- data.byte(kMenucount) = 0;
-menuframeok:
- al = data.byte(kMenucount);
- _shr(al, 1);
- ah = 0;
- di = (80+40);
- bx = (60);
- ds = data.word(kTempgraphics);
- showFrame();
-}
-
void DreamGenContext::enterSymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 86aa288..79af657 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -651,7 +651,7 @@ public:
void femaleFan();
void identifyOb();
void useLighter();
- void showMenu();
+ void runEndSeq();
void usePoolReader();
void useOpenBox();
void clearBuffers();
@@ -676,7 +676,6 @@ public:
void getTime();
void candles1();
void fadeDOS();
- void runEndSeq();
void loadKeypad();
void findText1();
void isRyanHolding();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 8b28480..827f888 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2731,6 +2731,13 @@ void DreamGenContext::loadMenu() {
loadIntoTemp2("DREAMWEB.G07");
}
+void DreamGenContext::showMenu() {
+ ++data.byte(kMenucount);
+ if (data.byte(kMenucount) == 37*2)
+ data.byte(kMenucount) = 0;
+ showFrame(tempGraphics(), kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
+}
+
void DreamGenContext::useMenu() {
getRidOfReels();
loadMenu();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 4b2ec56..ab597b1 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -304,6 +304,7 @@
void fadeupMonFirst();
void printLogo();
void loadMenu();
+ void showMenu();
void useMenu();
void useMon();
void scrollMonitor();
Commit: d37a4ee95e3ff5beddfda4b60ad93259491b8e4c
https://github.com/scummvm/scummvm/commit/d37a4ee95e3ff5beddfda4b60ad93259491b8e4c
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-12-03T06:59:04-08:00
Commit Message:
DREAMWEB: 'dumpMenu' 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 187e4d6..d3cb582 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -256,6 +256,7 @@ generator = cpp(context, "DreamGen", blacklist = [
'printlogo',
'loadmenu',
'showmenu',
+ 'dumpmenu',
'usemenu',
'usemon',
'scrollmonitor',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 1dafee3..8ade751 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -9161,15 +9161,6 @@ void DreamGenContext::dumpKeypad() {
multiDump();
}
-void DreamGenContext::dumpMenu() {
- STACK_CHECK;
- di = (80+40);
- bx = (60);
- cl = 48;
- ch = 48;
- multiDump();
-}
-
void DreamGenContext::enterSymbol() {
STACK_CHECK;
data.byte(kManisoffscreen) = 1;
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 79af657..aaff3fe 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -801,7 +801,6 @@ public:
void putUnderZoom();
void vSync();
void findInvPos();
- void dumpMenu();
void liftNoise();
void workoutFrames();
void dumpSymBox();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 827f888..6dec0c1 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -2738,6 +2738,10 @@ void DreamGenContext::showMenu() {
showFrame(tempGraphics(), kMenux, kMenuy, data.byte(kMenucount) / 2, 0);
}
+void DreamGenContext::dumpMenu() {
+ multiDump(kMenux, kMenuy, 48, 48);
+}
+
void DreamGenContext::useMenu() {
getRidOfReels();
loadMenu();
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index ab597b1..3059bc8 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -305,6 +305,7 @@
void printLogo();
void loadMenu();
void showMenu();
+ void dumpMenu();
void useMenu();
void useMon();
void scrollMonitor();
More information about the Scummvm-git-logs
mailing list