[Scummvm-cvs-logs] scummvm master -> 22787ec542626b4b530047fe0d6c8727dcdf0cd1
digitall
digitall at scummvm.org
Mon Dec 5 20:10:16 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:
22787ec542 DREAMWEB: Remove more unused filenames from constant data segment.
Commit: 22787ec542626b4b530047fe0d6c8727dcdf0cd1
https://github.com/scummvm/scummvm/commit/22787ec542626b4b530047fe0d6c8727dcdf0cd1
Author: D G Turner (digitall at scummvm.org)
Date: 2011-12-05T11:08:51-08:00
Commit Message:
DREAMWEB: Remove more unused filenames from constant data segment.
Changed paths:
devtools/tasmrecover/tasm-recover
engines/dreamweb/dreamgen.cpp
engines/dreamweb/dreamgen.h
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index 9ee8268..91d43a4 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -80,6 +80,7 @@ p = parser(skip_binary_data = [
'r20','r22','r23','r25','r26','r27','r28','r29',
'r45','r46','r47','r52','r53','r55',
# titles.asm
+ 'introtextname',
'title0graphics',
'title1graphics',
'title2graphics',
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index 635aecf..1758fd0 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 = 1074;
+ dx = 1061;
loadIntoTemp();
createPanel2();
ds = data.word(kTempgraphics);
@@ -2069,7 +2069,7 @@ void DreamGenContext::showGun() {
al = 12;
ah = 0;
playChannel0();
- dx = 1048;
+ dx = 1035;
loadTempText();
rollEndCredits2();
getRidOfTempText();
@@ -2317,7 +2317,7 @@ void DreamGenContext::initialMonCols() {
void DreamGenContext::endGame() {
STACK_CHECK;
- dx = 1048;
+ dx = 1035;
loadTempText();
monkSpeaking();
gettingShot();
@@ -2332,7 +2332,7 @@ void DreamGenContext::monkSpeaking() {
STACK_CHECK;
data.byte(kRoomssample) = 35;
loadRoomsSample();
- dx = 1087;
+ dx = 1074;
loadIntoTemp();
clearWork();
showMonk();
@@ -4883,14 +4883,14 @@ void DreamGenContext::getDestInfo() {
push(ax);
dx = data;
es = dx;
- si = 1736;
+ si = 1723;
_add(si, ax);
cl = es.byte(si);
ax = pop();
push(cx);
dx = data;
es = dx;
- si = 1752;
+ si = 1739;
_add(si, ax);
ax = pop();
}
@@ -5067,7 +5067,7 @@ clearedlocations:
bx = ax;
dx = data;
es = dx;
- _add(bx, 1736);
+ _add(bx, 1723);
es.byte(bx) = 0;
}
@@ -5165,7 +5165,7 @@ void DreamGenContext::execCommand() {
es = cs;
bx = offset_comlist;
ds = cs;
- si = 1770;
+ si = 1757;
al = ds.byte(si);
_cmp(al, 0);
if (!flags.z())
@@ -5258,7 +5258,7 @@ dirroot:
si = offset_rootdir;
_inc(si);
es = cs;
- di = 1425;
+ di = 1412;
_inc(di);
cx = 12;
_movsb(cx, true);
@@ -5360,7 +5360,7 @@ notyetassigned:
push(bx);
_add(bx, 2);
ds = cs;
- si = 1770;
+ si = 1757;
checkpass:
_lodsw();
ah = es.byte(bx);
@@ -5431,7 +5431,7 @@ void DreamGenContext::read() {
return;
okcom:
es = cs;
- di = 1425;
+ di = 1412;
ax = data.word(kTextfile1);
data.word(kMonsource) = ax;
ds = ax;
@@ -5561,7 +5561,7 @@ keyok2:
ds = cs;
si = offset_operand1+1;
es = cs;
- di = 1425+1;
+ di = 1412+1;
cx = 12;
_movsb(cx, true);
monitorLogo();
@@ -5688,7 +5688,7 @@ void DreamGenContext::parser() {
al = '=';
_stosb();
ds = cs;
- si = 1770;
+ si = 1757;
notspace1:
_lodsw();
_cmp(al, 32);
@@ -9210,7 +9210,7 @@ void DreamGenContext::getNamePos() {
_mul(cx);
dx = data;
es = dx;
- bx = 1904;
+ bx = 1891;
_add(bx, ax);
al = data.byte(kCursorpos);
ah = 0;
@@ -9364,7 +9364,7 @@ void DreamGenContext::showNames() {
STACK_CHECK;
dx = data;
es = dx;
- si = 1904+1;
+ si = 1891+1;
di = (60)+21;
bx = (52)+10;
cl = 0;
@@ -9884,7 +9884,7 @@ void DreamGenContext::clearChanges() {
di = 0;
_stosw(cx, true);
es = cs;
- di = 1736;
+ di = 1723;
al = 1;
_stosb(2);
al = 0;
@@ -10684,97 +10684,97 @@ void DreamGenContext::__start() {
//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, 0x37, 0x00, 0x00, 0x01, 0x11, 0x01, 0x40, 0x01, 0x9d,
- //0x0450: MWEB .I07 .... . at ..
- 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00, 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00, 0x94, 0xc4, 0x00,
- //0x0460: ...| ..." ..., ....
- 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01, 0x40, 0x01, 0x9d,
- //0x0470: . at .. .... .... . at ..
- 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff,
- //0x0480: ...| ...@ .... ....
- 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00, 0x7c, 0x00, 0x04,
- //0x0490: .... ..., ...h .|..
- 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01, 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xb0, 0xc4, 0x68,
- //0x04a0: .,.. ...4 ..., ...h
- 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00, 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01, 0x9d, 0x00, 0xc6,
- //0x04b0: .... .... ...@ ....
- 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x45,
- //0x04c0: .|.. . at .. .... ...E
- 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20,
- //0x04d0: XIT HEL P
- 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41,
- //0x04e0: L IST REA
- 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20,
- //0x04f0: D L OGON
- 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42,
- //0x0500: KEY S . .PUB
- 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20,
- //0x0510: LIC PUB LIC
- 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47,
- //0x0520: ...B LACK DRAG
- 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00,
- //0x0530: ON R YAN ..
- 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55,
- //0x0540: .HEN DRIX LOU
- 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49,
- //0x0550: IS ...S EPTI
- 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20,
- //0x0560: MUS B ECKE TT
- 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0570: .. .
- 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0580: ." ROOT
- 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30,
- //0x0590: ." .0
- 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00, 0xad, 0x00, 0x1c,
- //0x05a0: 000. 00.. .... ....
- 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00, 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01, 0x1c, 0x01, 0xa8,
- //0x05b0: .... .... .... ....
- 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff,
- //0x05c0: ...P ...@ .... ....
- 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00, 0x89, 0x00, 0x3e,
- //0x05d0: .w.. .R.. .4.F ...>
- 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00, 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00, 0x4c, 0xc8, 0x00,
- //0x05e0: .o.. .... .D.. .L..
- 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52,
- //0x05f0: . at .. .... ...w ...R
- 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00, 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x50, 0xc8, 0xec,
- //0x0600: ...D .F.. .>.o .P..
- 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8,
- //0x0610: ...p ...H ...@ ....
- 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8, 0x00, 0x52, 0x00,
- //0x0620: .... .... .$.. ..R.
- 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xb7, 0x00,
- //0x0630: .... P... >.o. ....
- 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00,
- //0x0640: ..>. o... .. at . ....
- 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30,
- //0x0650: .... SPEE CHR2 4C00
- 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41,
- //0x0660: 05.R AW.O BJEC T NA
- 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
- //0x0670: ME O NE
- 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
- //0x0680: .
- 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x0690: .... .... .... ....
- 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- //0x06a0: .... .... D:.. ....
+ 0x57, 0x45, 0x42, 0x2e, 0x54, 0x38, 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42,
+ //0x0410: WEB. T83. DREA MWEB
+ 0x2e, 0x56, 0x4f, 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31,
+ //0x0420: .VOL .DRE AMWE B.G1
+ 0x33, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44,
+ //0x0430: 3.DR EAMW EB.G 15.D
+ 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x37, 0x00, 0x00, 0x01, 0x11, 0x01,
+ //0x0440: REAM WEB. I07. ....
+ 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0xf0, 0x00, 0x22, 0x01, 0x02, 0x00, 0x2c, 0x00,
+ //0x0450: @... ..|. ..". ..,.
+ 0x94, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x11, 0x01,
+ //0x0460: .... @... .... ....
+ 0x40, 0x01, 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00,
+ //0x0470: @... ..|. .. at . ....
+ 0xa0, 0xca, 0xff, 0xff, 0xee, 0x00, 0x02, 0x01, 0x04, 0x00, 0x2c, 0x00, 0xc8, 0xc4, 0x68, 0x00,
+ //0x0480: .... .... ..,. ..h.
+ 0x7c, 0x00, 0x04, 0x00, 0x2c, 0x00, 0xcc, 0xc4, 0x18, 0x01, 0x34, 0x01, 0x04, 0x00, 0x2c, 0x00,
+ //0x0490: |... ,... ..4. ..,.
+ 0xb0, 0xc4, 0x68, 0x00, 0xd8, 0x00, 0x8a, 0x00, 0xc0, 0x00, 0xd0, 0xc4, 0x11, 0x01, 0x40, 0x01,
+ //0x04a0: ..h. .... .... .. at .
+ 0x9d, 0x00, 0xc6, 0x00, 0x7c, 0xc4, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca,
+ //0x04b0: .... |... @... ....
+ 0xff, 0xff, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50,
+ //0x04c0: ..EX IT HELP
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x04d0: LI ST
+ 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20,
+ //0x04e0: READ LO GON
+ 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00,
+ //0x04f0: KEYS ..
+ 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c,
+ //0x0500: PUBL IC PUBL
+ 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44,
+ //0x0510: IC . ..BL ACKD
+ 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0520: RAGO N RY AN
+ 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0530: ... HEND RIX
+ 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45,
+ //0x0540: LOUI S . ..SE
+ 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54,
+ //0x0550: PTIM US BE CKET
+ 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0560: T ...
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0570: ."R OOT
+ 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0580: . "
+ 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0xba, 0x00, 0xca, 0x00, 0x9d, 0x00,
+ //0x0590: .00 00.0 0... ....
+ 0xad, 0x00, 0x1c, 0xc8, 0xf3, 0x00, 0x03, 0x01, 0x83, 0x00, 0x93, 0x00, 0x18, 0xc8, 0x0c, 0x01,
+ //0x05a0: .... .... .... ....
+ 0x1c, 0x01, 0xa8, 0x00, 0xb8, 0x00, 0x50, 0xc7, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00,
+ //0x05b0: .... ..P. .. at . ....
+ 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00, 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x34, 0xc8, 0x46, 0x00,
+ //0x05c0: .... w... R... 4.F.
+ 0x89, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80, 0xc8, 0xbc, 0x00, 0xfa, 0x00, 0x44, 0x00, 0x98, 0x00,
+ //0x05d0: ..>. o... .... D...
+ 0x4c, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x77, 0x00,
+ //0x05e0: L... @... .... ..w.
+ 0xae, 0x00, 0x52, 0x00, 0x80, 0x00, 0x44, 0xc8, 0x46, 0x00, 0x8b, 0x00, 0x3e, 0x00, 0x6f, 0x00,
+ //0x05f0: ..R. ..D. F... >.o.
+ 0x50, 0xc8, 0xec, 0x00, 0xfc, 0x00, 0x70, 0x00, 0x80, 0x00, 0x48, 0xc8, 0x00, 0x00, 0x40, 0x01,
+ //0x0600: P... ..p. ..H. .. at .
+ 0x00, 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x81, 0x00, 0xb8,
+ //0x0610: .... .... .... $...
+ 0x00, 0x52, 0x00, 0x80, 0x00, 0xc0, 0xc8, 0x50, 0x00, 0x93, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0x80,
+ //0x0620: .R.. ...P ...> .o..
+ 0xc8, 0xb7, 0x00, 0xfa, 0x00, 0x3e, 0x00, 0x6f, 0x00, 0xc4, 0xc8, 0x00, 0x00, 0x40, 0x01, 0x00,
+ //0x0630: .... .>.o .... . at ..
+ 0x00, 0xc8, 0x00, 0xa0, 0xca, 0xff, 0xff, 0x53, 0x50, 0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34,
+ //0x0640: .... ...S PEEC HR24
+ 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54,
+ //0x0650: C000 5.RA W.OB JECT
+ 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0660: NAM E ON E
+ 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+ //0x0670:
+ 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ //0x0680: .. .... .... ....
+ 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00,
+ //0x0690: .... .... ...D :...
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ //0x06a0: .... .... .... ....
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00,
//0x06b0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04,
//0x06c0: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09,
+ 0x01, 0x0a, 0x09, 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x06d0: .... .... .... ....
- 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, 0x00,
//0x06e0: .... .... .... ....
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
//0x06f0: .... .... .... ....
@@ -10788,25 +10788,23 @@ void DreamGenContext::__start() {
//0x0730: .... .... .... ....
0x00, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
//0x0750: .... .... .... ....
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0760: .... .... .... ....
- 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0770: .... .... .... ....
- 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0780: .... .... .... ....
- 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x0790: .... .... .... ....
- 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x07a0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x07b0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01,
//0x07c0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- //0x07d0: .... .... .... ....
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, };
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 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 475f20a..2c6bb10 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_opslist = 0x05d1;
- static const uint16 offset_rootdir = 0x0583;
- static const uint16 offset_operand1 = 0x0575;
- static const uint16 offset_speechfile = 0x065a;
- static const uint16 offset_commandline = 0x0667;
- static const uint16 offset_keys = 0x050b;
- static const uint16 offset_money1poke = 0x059f;
- static const uint16 offset_openchangesize = 0x0459;
- static const uint16 offset_money2poke = 0x05a4;
- static const uint16 offset_talklist = 0x045b;
- static const uint16 offset_discopslist = 0x05fb;
- static const uint16 offset_quitlist = 0x047b;
- static const uint16 offset_speechfilename = 0x0654;
- static const uint16 offset_destlist = 0x0491;
- static const uint16 offset_comlist = 0x04cf;
- static const uint16 offset_diarylist = 0x05a7;
- static const uint16 offset_decidelist = 0x062a;
+ static const uint16 offset_destlist = 0x0484;
+ static const uint16 offset_rootdir = 0x0576;
+ static const uint16 offset_opslist = 0x05c4;
+ static const uint16 offset_speechfilename = 0x0647;
+ static const uint16 offset_operand1 = 0x0568;
+ static const uint16 offset_money2poke = 0x0597;
+ static const uint16 offset_quitlist = 0x046e;
+ static const uint16 offset_keys = 0x04fe;
+ static const uint16 offset_decidelist = 0x061d;
+ static const uint16 offset_discopslist = 0x05ee;
+ static const uint16 offset_diarylist = 0x059a;
+ static const uint16 offset_commandline = 0x065a;
+ static const uint16 offset_comlist = 0x04c2;
+ static const uint16 offset_speechfile = 0x064d;
+ static const uint16 offset_talklist = 0x044e;
+ static const uint16 offset_openchangesize = 0x044c;
+ static const uint16 offset_money1poke = 0x0592;
static const uint16 kStartvars = 0;
static const uint16 kProgresspoints = 1;
static const uint16 kWatchon = 2;
@@ -431,22 +431,21 @@ public:
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 kTitle7graphics = 1100;
- static const uint16 kCurrentfile = 1425;
- static const uint16 kRoomscango = 1736;
- static const uint16 kRoompics = 1752;
- static const uint16 kOplist = 1767;
- static const uint16 kInputline = 1770;
- static const uint16 kPresslist = 1898;
- static const uint16 kSavenames = 1904;
- static const uint16 kQuitrequested = 2023;
- static const uint16 kSubtitles = 2024;
- static const uint16 kForeignrelease = 2025;
+ static const uint16 kEndtextname = 1035;
+ static const uint16 kVolumetabname = 1048;
+ static const uint16 kGungraphic = 1061;
+ static const uint16 kMonkface = 1074;
+ static const uint16 kTitle7graphics = 1087;
+ static const uint16 kCurrentfile = 1412;
+ static const uint16 kRoomscango = 1723;
+ static const uint16 kRoompics = 1739;
+ static const uint16 kOplist = 1754;
+ static const uint16 kInputline = 1757;
+ static const uint16 kPresslist = 1885;
+ static const uint16 kSavenames = 1891;
+ static const uint16 kQuitrequested = 2010;
+ static const uint16 kSubtitles = 2011;
+ static const uint16 kForeignrelease = 2012;
static const uint16 kBlocktextdat = (0);
static const uint16 kPersonframes = (0);
static const uint16 kDebuglevel1 = (0);
More information about the Scummvm-git-logs
mailing list