[Scummvm-cvs-logs] scummvm master -> 7074f067620e5ada692f93fa0ff4e80dd7ae4355
wjp
wjp at usecode.org
Mon Dec 5 00:07:11 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:
7074f06762 DREAMWEB: Remove more unused data
Commit: 7074f067620e5ada692f93fa0ff4e80dd7ae4355
https://github.com/scummvm/scummvm/commit/7074f067620e5ada692f93fa0ff4e80dd7ae4355
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-04T15:06:31-08:00
Commit Message:
DREAMWEB: Remove more unused data
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
engines/dreamweb/stubs.cpp
engines/dreamweb/vgagrafx.cpp
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 10d79db..58d1d0a 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -68,6 +68,7 @@ p = parser(skip_binary_data = [
'error6patch',
'gameinfo',
'endgametext1',
+ 'savefiles',
# sblaster.asm
'dmaaddresses',
# sprite.asm
@@ -116,6 +117,10 @@ p = parser(skip_binary_data = [
'monitorfile23',
'monitorfile24',
'introtextfile',
+ 'palettescreen',
+ 'idname',
+ 'samplename',
+ # 'basicsample', # This can't be removed due to tasm-recover limitations
])
p.strip_path = 3
context = p.parse('dreamweb/dreamweb.asm')
@@ -311,7 +316,9 @@ generator = cpp(context, "DreamGen", blacklist = [
'loadposition',
'loadroom',
'loadroomssample',
+ 'loadsample',
'loadsavebox',
+ 'loadsecondsample',
'loadtempcharset',
'loadtemptext',
'loadtraveltext',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 9515f04..7220e45 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -2046,7 +2046,7 @@ void DreamGenContext::showGun() {
data.byte(kRoomssample) = 34;
loadRoomsSample();
data.byte(kVolume) = 0;
- dx = 1099;
+ dx = 1074;
loadIntoTemp();
createPanel2();
ds = data.word(kTempgraphics);
@@ -2069,7 +2069,7 @@ void DreamGenContext::showGun() {
al = 12;
ah = 0;
playChannel0();
- dx = 1073;
+ dx = 1048;
loadTempText();
rollEndCredits2();
getRidOfTempText();
@@ -2317,7 +2317,7 @@ void DreamGenContext::initialMonCols() {
void DreamGenContext::endGame() {
STACK_CHECK;
- dx = 1073;
+ dx = 1048;
loadTempText();
monkSpeaking();
gettingShot();
@@ -2332,7 +2332,7 @@ void DreamGenContext::monkSpeaking() {
STACK_CHECK;
data.byte(kRoomssample) = 35;
loadRoomsSample();
- dx = 1112;
+ dx = 1087;
loadIntoTemp();
clearWork();
showMonk();
@@ -2399,7 +2399,7 @@ void DreamGenContext::gettingShot() {
void DreamGenContext::bibleQuote() {
STACK_CHECK;
mode640x480();
- dx = 1125;
+ dx = 1100;
showPCX();
fadeScreenUps();
cx = 80;
@@ -2438,7 +2438,7 @@ hangonloope:
void DreamGenContext::intro() {
STACK_CHECK;
- dx = 1060;
+ dx = 1035;
loadTempText();
loadPalFromIFF();
setMode();
@@ -2571,7 +2571,7 @@ void DreamGenContext::realCredits() {
mode640x480();
cx = 35;
hangOn();
- dx = 1138;
+ dx = 1113;
showPCX();
al = 12;
ah = 0;
@@ -2593,7 +2593,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1151;
+ dx = 1126;
showPCX();
al = 12;
ah = 0;
@@ -2615,7 +2615,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1164;
+ dx = 1139;
showPCX();
al = 12;
ah = 0;
@@ -2637,7 +2637,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1177;
+ dx = 1152;
showPCX();
al = 12;
ah = 0;
@@ -2659,7 +2659,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1190;
+ dx = 1165;
showPCX();
al = 12;
ah = 0;
@@ -2681,7 +2681,7 @@ void DreamGenContext::realCredits() {
_cmp(data.byte(kLasthardkey), 1);
if (flags.z())
goto realcreditsearly;
- dx = 1203;
+ dx = 1178;
showPCX();
fadeScreenUps();
cx = 60;
@@ -5112,14 +5112,14 @@ void DreamGenContext::getDestInfo() {
push(ax);
dx = data;
es = dx;
- si = 1865;
+ si = 1827;
_add(si, ax);
cl = es.byte(si);
ax = pop();
push(cx);
dx = data;
es = dx;
- si = 1881;
+ si = 1843;
_add(si, ax);
ax = pop();
}
@@ -5296,7 +5296,7 @@ clearedlocations:
bx = ax;
dx = data;
es = dx;
- _add(bx, 1865);
+ _add(bx, 1827);
es.byte(bx) = 0;
}
@@ -5394,7 +5394,7 @@ void DreamGenContext::execCommand() {
es = cs;
bx = offset_comlist;
ds = cs;
- si = 1899;
+ si = 1861;
al = ds.byte(si);
_cmp(al, 0);
if (!flags.z())
@@ -5487,7 +5487,7 @@ dirroot:
si = offset_rootdir;
_inc(si);
es = cs;
- di = 1554;
+ di = 1516;
_inc(di);
cx = 12;
_movsb(cx, true);
@@ -5589,7 +5589,7 @@ notyetassigned:
push(bx);
_add(bx, 2);
ds = cs;
- si = 1899;
+ si = 1861;
checkpass:
_lodsw();
ah = es.byte(bx);
@@ -5660,7 +5660,7 @@ void DreamGenContext::read() {
return;
okcom:
es = cs;
- di = 1554;
+ di = 1516;
ax = data.word(kTextfile1);
data.word(kMonsource) = ax;
ds = ax;
@@ -5790,7 +5790,7 @@ keyok2:
ds = cs;
si = offset_operand1+1;
es = cs;
- di = 1554+1;
+ di = 1516+1;
cx = 12;
_movsb(cx, true);
monitorLogo();
@@ -5917,7 +5917,7 @@ void DreamGenContext::parser() {
al = '=';
_stosb();
ds = cs;
- si = 1899;
+ si = 1861;
notspace1:
_lodsw();
_cmp(al, 32);
@@ -8981,11 +8981,11 @@ void DreamGenContext::dumpSymBox() {
void DreamGenContext::useDiary() {
STACK_CHECK;
getRidOfReels();
- dx = 1034;
+ dx = 1009;
loadIntoTemp();
- dx = 1047;
+ dx = 1022;
loadTempText();
- dx = 995;
+ dx = 983;
loadTempCharset();
createPanel();
showIcon();
@@ -9439,7 +9439,7 @@ void DreamGenContext::getNamePos() {
_mul(cx);
dx = data;
es = dx;
- bx = 2033;
+ bx = 1995;
_add(bx, ax);
al = data.byte(kCursorpos);
ah = 0;
@@ -9593,7 +9593,7 @@ void DreamGenContext::showNames() {
STACK_CHECK;
dx = data;
es = dx;
- si = 2033+1;
+ si = 1995+1;
di = (60)+21;
bx = (52)+10;
cl = 0;
@@ -10113,7 +10113,7 @@ void DreamGenContext::clearChanges() {
di = 0;
_stosw(cx, true);
es = cs;
- di = 1865;
+ di = 1827;
al = 1;
_stosb(2);
al = 0;
@@ -10905,121 +10905,121 @@ void DreamGenContext::__start() {
//0x03b0: .... .... ...2 ....
0x1e, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21,
//0x03c0: ...2 .... ...2 ...!
- 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x49, 0x4e, 0x53, 0x54, 0x41, 0x4c, 0x4c, 0x2e, 0x44,
- //0x03d0: (..2 ...I NSTA LL.D
- 0x41, 0x54, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x43, 0x30, 0x32, 0x00,
- //0x03e0: AT.D REAM WEB. C02.
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45,
- //0x03f0: DREA MWEB .V00 .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
- //0x0400: AMWE B.V9 9.DR EAMW
- 0x45, 0x42, 0x2e, 0x47, 0x31, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
- //0x0410: EB.G 14.D REAM WEB.
- 0x54, 0x35, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32,
- //0x0420: T51. DREA MWEB .T82
- 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52,
- //0x0430: .DRE AMWE B.T8 3.DR
- 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f, 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d,
- //0x0440: EAMW EB.V OL.D REAM
- 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
- //0x0450: WEB. G13. DREA MWEB
- 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30,
- //0x0460: .G15 .DRE AMWE B.I0
- 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44,
- //0x0470: 0.DR EAMW EB.I 01.D
- 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41,
- //0x0480: REAM WEB. I02. DREA
- 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
- //0x0490: MWEB .I03 .DRE AMWE
- 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49,
- //0x04a0: B.I0 4.DR EAMW EB.I
- 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00,
- //0x04b0: 05.D REAM WEB. I06.
- 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x37, 0x00, 0x44, 0x52, 0x45,
- //0x04c0: DREA MWEB .I07 .DRE
- 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x50, 0x41, 0x4c, 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01,
- //0x04d0: AMWE B.PA L... .. at .
- 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00, 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4,
- //0x04e0: .... |... "... ,...
- 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01,
- //0x04f0: .. at . .... .... .. at .
- 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca,
- //0x0500: .... |... @... ....
- 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00,
- //0x0510: .... .... ,... h.|.
- 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01, 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4,
- //0x0520: ..,. .... 4... ,...
- 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00, 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00,
- //0x0530: h... .... .... @...
- 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff,
- //0x0540: ..|. .. at . .... ....
- 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20,
- //0x0550: EXIT HE LP
- 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45,
- //0x0560: LIST RE
- 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20,
- //0x0570: AD LOGO N
- 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55,
- //0x0580: KE YS ..PU
- 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43,
- //0x0590: BLIC PU BLIC
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41,
- //0x05a0: ... BLAC KDRA
- 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
- //0x05b0: GON RYAN .
- 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f,
- //0x05c0: ..HE NDRI X LO
- 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54,
- //0x05d0: UIS ... SEPT
- 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20,
- //0x05e0: IMUS BECK ETT
- 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x05f0: . ..
- 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0600: . "ROO T
- 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
- //0x0610: ." .
- 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00,
- //0x0620: 0000 .00. .... ....
- 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00, 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01,
- //0x0630: .... .... .... ....
- 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca,
- //0x0640: .... P... @... ....
- 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00,
- //0x0650: ..w. ..R. ..4. F...
- 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00, 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8,
- //0x0660: >.o. .... ..D. ..L.
+ 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
+ //0x03d0: (..2 ...D REAM WEB.
+ 0x43, 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39,
+ //0x03e0: C02. DREA MWEB .V99
+ 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x34, 0x00, 0x44, 0x52,
+ //0x03f0: .DRE AMWE B.G1 4.DR
+ 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x54, 0x35, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d,
+ //0x0400: EAMW EB.T 51.D REAM
+ 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
+ //0x0410: WEB. T82. DREA MWEB
+ 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f,
+ //0x0420: .T83 .DRE AMWE B.VO
+ 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x33, 0x00, 0x44,
+ //0x0430: L.DR EAMW EB.G 13.D
+ 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41,
+ //0x0440: REAM WEB. G15. DREA
+ 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
+ //0x0450: MWEB .I00 .DRE AMWE
+ 0x42, 0x2e, 0x49, 0x30, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49,
+ //0x0460: B.I0 1.DR EAMW EB.I
+ 0x30, 0x32, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x33, 0x00,
+ //0x0470: 02.D REAM WEB. I03.
+ 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45,
+ //0x0480: DREA MWEB .I04 .DRE
+ 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57,
+ //0x0490: AMWE B.I0 5.DR EAMW
+ 0x45, 0x42, 0x2e, 0x49, 0x30, 0x36, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e,
+ //0x04a0: EB.I 06.D REAM WEB.
+ 0x49, 0x30, 0x37, 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4,
+ //0x04b0: I07. .... @... ..|.
+ 0xf0, 0x00, 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+ //0x04c0: ..". ..,. .... @...
+ 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4,
+ //0x04d0: .... .... @... ..|.
+ 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01,
+ //0x04e0: .. at . .... .... ....
+ 0x04, 0x00, 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4,
+ //0x04f0: ..,. ..h. |... ,...
+ 0x18, 0x01, 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00,
+ //0x0500: ..4. ..,. ..h. ....
+ 0xc0, 0x00, 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00,
+ //0x0510: .... .. at . .... |...
+ 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20,
+ //0x0520: @... .... ..EX IT
+ 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49,
+ //0x0530: HELP LI
+ 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20,
+ //0x0540: ST READ
+ 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53,
+ //0x0550: LO GON KEYS
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20,
+ //0x0560: .. PUBL IC
+ 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+ //0x0570: PUBL IC .
+ 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59,
+ //0x0580: ..BL ACKD RAGO N RY
+ 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44,
+ //0x0590: AN ... HEND
+ 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20,
+ //0x05a0: RIX LOUI S
+ 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20,
+ //0x05b0: . ..SE PTIM US
+ 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff,
+ //0x05c0: BE CKET T ...
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52,
+ //0x05d0: ."R
+ 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20,
+ //0x05e0: OOT . "
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30,
+ //0x05f0: .00 00.0
+ 0x30, 0x00, 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01,
+ //0x0600: 0... .... .... ....
+ 0x83, 0x00, 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7,
+ //0x0610: .... .... .... ..P.
0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00,
- //0x0670: .. at . .... .... w...
- 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00, 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8,
- //0x0680: R... D.F. ..>. o.P.
- 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
- //0x0690: .... p... H... @...
- 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52,
- //0x06a0: .... .... ..$. ...R
- 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7,
- //0x06b0: .... .P.. .>.o ....
- 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8,
- //0x06c0: ...> .o.. ...@ ....
- 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30,
- //0x06d0: .... .SPE ECHR 24C0
- 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e,
- //0x06e0: 005. RAW. OBJE CT N
- 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x06f0: AME ONE
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0700:
- 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0710: .... .... .... ....
- 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x0720: .... .... .D:. ....
+ //0x0620: .. at . .... .... w...
+ 0x52, 0x00, 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8,
+ //0x0630: R... 4.F. ..>. o...
+ 0xbc, 0x00, 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00,
+ //0x0640: .... D... L... @...
+ 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8,
+ //0x0650: .... ..w. ..R. ..D.
+ 0x46, 0x00, 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00,
+ //0x0660: F... >.o. P... ..p.
+ 0x80, 0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff,
+ //0x0670: ..H. .. at . .... ....
+ 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50,
+ //0x0680: .... $... .R.. ...P
+ 0x00, 0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f,
+ //0x0690: ...> .o.. .... .>.o
+ 0x00, 0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53,
+ //0x06a0: .... . at .. .... ...S
+ 0x50, 0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41,
+ //0x06b0: PEEC HR24 C000 5.RA
+ 0x57, 0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e,
+ //0x06c0: W.OB JECT NAM E ON
+ 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x06d0: E
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10,
+ //0x06e0: .. ....
+ 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
+ //0x06f0: .... .... .... ....
+ 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0700: ...D :... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0710: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x0720: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07,
//0x0730: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
+ 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0740: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0750: .... .... .... ....
- 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0760: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x0770: .... .... .... ....
@@ -11031,39 +11031,23 @@ void DreamGenContext::__start() {
//0x07a0: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x07b0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01,
//0x07c0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01,
//0x07d0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01,
//0x07e0: .... .... .... ....
- 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00,
//0x07f0: .... .... .... ....
- 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02,
//0x0800: .... .... .... ....
- 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0810: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0820: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0830: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0840: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0850: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
- //0x0860: .... .... DREA MWEB
- 0x2e, 0x44, 0x30, 0x30, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30,
- //0x0870: .D00 .DRE AMWE B.D0
- 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x32, 0x00, 0x44,
- //0x0880: 1.DR EAMW EB.D 02.D
- 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41,
- //0x0890: REAM WEB. D03. DREA
- 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44, 0x30, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45,
- //0x08a0: MWEB .D04 .DRE AMWE
- 0x42, 0x2e, 0x44, 0x30, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x44,
- //0x08b0: B.D0 5.DR EAMW EB.D
- 0x30, 0x36, 0x00, 0x00, 0x00, 0x00, };
+ 0x01, 0x01, 0x00, 0x00, 0x00, };
ds.assign(src, src + sizeof(src));
dreamweb();
}
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 4128073..9964be8 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -36,23 +36,23 @@ public:
void __start();
#include "stubs.h" // Allow hand-reversed functions to have a signature different than void f()
- static const uint16 offset_quitlist = 0x04fc;
- static const uint16 offset_commandline = 0x06e8;
- static const uint16 offset_money1poke = 0x0620;
- static const uint16 offset_speechfile = 0x06db;
- static const uint16 offset_money2poke = 0x0625;
- static const uint16 offset_keys = 0x058c;
- static const uint16 offset_talklist = 0x04dc;
- static const uint16 offset_diarylist = 0x0628;
- static const uint16 offset_rootdir = 0x0604;
- static const uint16 offset_comlist = 0x0550;
- static const uint16 offset_openchangesize = 0x04da;
- static const uint16 offset_operand1 = 0x05f6;
- static const uint16 offset_destlist = 0x0512;
- static const uint16 offset_opslist = 0x0652;
- static const uint16 offset_speechfilename = 0x06d5;
- static const uint16 offset_decidelist = 0x06ab;
- static const uint16 offset_discopslist = 0x067c;
+ static const uint16 offset_comlist = 0x052a;
+ static const uint16 offset_speechfile = 0x06b5;
+ static const uint16 offset_rootdir = 0x05de;
+ static const uint16 offset_money2poke = 0x05ff;
+ static const uint16 offset_decidelist = 0x0685;
+ static const uint16 offset_speechfilename = 0x06af;
+ static const uint16 offset_diarylist = 0x0602;
+ static const uint16 offset_openchangesize = 0x04b4;
+ static const uint16 offset_destlist = 0x04ec;
+ static const uint16 offset_operand1 = 0x05d0;
+ static const uint16 offset_talklist = 0x04b6;
+ static const uint16 offset_quitlist = 0x04d6;
+ static const uint16 offset_keys = 0x0566;
+ static const uint16 offset_discopslist = 0x0656;
+ static const uint16 offset_opslist = 0x062c;
+ static const uint16 offset_money1poke = 0x05fa;
+ static const uint16 offset_commandline = 0x06c2;
static const uint16 kStartvars = 0;
static const uint16 kProgresspoints = 1;
static const uint16 kWatchon = 2;
@@ -427,37 +427,33 @@ public:
static const uint16 kGameerror = 523;
static const uint16 kHowmuchalloc = 524;
static const uint16 kReelroutines = 526;
- static const uint16 kIdname = 983;
- static const uint16 kCharacterset3 = 995;
- static const uint16 kSamplename = 1008;
- static const uint16 kBasicsample = 1021;
- static const uint16 kDiarygraphic = 1034;
- static const uint16 kDiarytext = 1047;
- static const uint16 kIntrotextname = 1060;
- static const uint16 kEndtextname = 1073;
- static const uint16 kVolumetabname = 1086;
- static const uint16 kGungraphic = 1099;
- static const uint16 kMonkface = 1112;
- static const uint16 kTitle0graphics = 1125;
- static const uint16 kTitle1graphics = 1138;
- static const uint16 kTitle2graphics = 1151;
- static const uint16 kTitle3graphics = 1164;
- static const uint16 kTitle4graphics = 1177;
- static const uint16 kTitle5graphics = 1190;
- static const uint16 kTitle6graphics = 1203;
- static const uint16 kTitle7graphics = 1216;
- static const uint16 kPalettescreen = 1229;
- static const uint16 kCurrentfile = 1554;
- static const uint16 kRoomscango = 1865;
- static const uint16 kRoompics = 1881;
- static const uint16 kOplist = 1896;
- static const uint16 kInputline = 1899;
- static const uint16 kPresslist = 2027;
- static const uint16 kSavenames = 2033;
- static const uint16 kSavefiles = 2152;
- static const uint16 kQuitrequested = 2243;
- static const uint16 kSubtitles = 2244;
- static const uint16 kForeignrelease = 2245;
+ static const uint16 kCharacterset3 = 983;
+ static const uint16 kBasicsample = 996;
+ static const uint16 kDiarygraphic = 1009;
+ static const uint16 kDiarytext = 1022;
+ static const uint16 kIntrotextname = 1035;
+ static const uint16 kEndtextname = 1048;
+ static const uint16 kVolumetabname = 1061;
+ static const uint16 kGungraphic = 1074;
+ static const uint16 kMonkface = 1087;
+ static const uint16 kTitle0graphics = 1100;
+ static const uint16 kTitle1graphics = 1113;
+ static const uint16 kTitle2graphics = 1126;
+ static const uint16 kTitle3graphics = 1139;
+ static const uint16 kTitle4graphics = 1152;
+ static const uint16 kTitle5graphics = 1165;
+ static const uint16 kTitle6graphics = 1178;
+ static const uint16 kTitle7graphics = 1191;
+ static const uint16 kCurrentfile = 1516;
+ static const uint16 kRoomscango = 1827;
+ static const uint16 kRoompics = 1843;
+ static const uint16 kOplist = 1858;
+ static const uint16 kInputline = 1861;
+ static const uint16 kPresslist = 1989;
+ static const uint16 kSavenames = 1995;
+ static const uint16 kQuitrequested = 2114;
+ static const uint16 kSubtitles = 2115;
+ static const uint16 kForeignrelease = 2116;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
@@ -844,7 +840,6 @@ public:
void callHotelLift();
void useFullCart();
void newPlace();
- void loadSample();
void useCardReader1();
void useCardReader2();
void useCardReader3();
@@ -910,7 +905,6 @@ public:
void quitKey();
void processTrigger();
void volumeAdjust();
- void loadSecondSample();
void transferConToEx();
void businessMan();
void adjustDown();
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index aa8450d..f02d22a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -484,8 +484,7 @@ void DreamGenContext::dreamweb() {
readSetData();
data.byte(kWongame) = 0;
- dx = kBasicsample;
- loadSample();
+ engine->loadSounds(0, "DREAMWEB.V99"); // basic sample
setSoundOff();
bool firstLoop = true;
@@ -1102,20 +1101,6 @@ void DreamGenContext::setSoundOff() {
warning("setsoundoff: STUB");
}
-void DreamGenContext::loadSample() {
- engine->loadSounds(0, (const char *)data.ptr(dx, 13));
-}
-
-void DreamGenContext::loadSecondSample() {
- uint8 ch0 = data.byte(kCh0playing);
- if (ch0 >= 12 && ch0 != 255)
- cancelCh0();
- uint8 ch1 = data.byte(kCh1playing);
- if (ch1 >= 12)
- cancelCh1();
- engine->loadSounds(1, (const char *)data.ptr(dx, 13));
-}
-
void DreamGenContext::loadSpeech() {
cancelCh1();
data.byte(kSpeechloaded) = 0;
@@ -2456,11 +2441,16 @@ void DreamGenContext::loadRoomsSample() {
if (sample == 255 || data.byte(kCurrentsample) == sample)
return; // loaded already
- data.byte(kCurrentsample) = sample;
- cs.byte(kSamplename+10) = '0' + sample / 10;
- cs.byte(kSamplename+11) = '0' + sample % 10;
- dx = kSamplename;
- loadSecondSample();
+ assert(sample < 100);
+ Common::String sampleName = Common::String::format("DREAMWEB.V%02d", sample);
+
+ uint8 ch0 = data.byte(kCh0playing);
+ if (ch0 >= 12 && ch0 != 255)
+ cancelCh0();
+ uint8 ch1 = data.byte(kCh1playing);
+ if (ch1 >= 12)
+ cancelCh1();
+ engine->loadSounds(1, sampleName.c_str());
}
void DreamGenContext::readSetData() {
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index fdeb373..847aa08 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -469,7 +469,6 @@ bool DreamGenContext::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
}
void DreamGenContext::loadPalFromIFF() {
- // TODO: Get rid of data blob position kPalettescreen;
engine->openFile("DREAMWEB.PAL");
engine->readFromFile(mapStore(), 2000);
engine->closeFile();
More information about the Scummvm-git-logs
mailing list