From 2bc6af518ce6ab2d1e7cc3b87adc6dc7862c1b8d Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 9 Dec 2011 10:30:55 +0200 Subject: DREAMWEB: Move some strings used by useDiary() out of the blob --- devtools/tasmrecover/tasm-recover | 3 + engines/dreamweb/dreamgen.cpp | 160 ++++++++++++++++++-------------------- engines/dreamweb/dreamgen.h | 49 ++++++------ engines/dreamweb/use.cpp | 6 +- 4 files changed, 106 insertions(+), 112 deletions(-) diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover index e73ba4962a..9f9b009213 100755 --- a/devtools/tasmrecover/tasm-recover +++ b/devtools/tasmrecover/tasm-recover @@ -127,6 +127,7 @@ p = parser(skip_binary_data = [ 'puzzletextname', 'commandtextname', 'characterset2', + 'characterset3', 'monitorfile1', 'monitorfile2', 'monitorfile10', @@ -142,6 +143,8 @@ p = parser(skip_binary_data = [ 'palettescreen', 'idname', 'samplename', + 'diarygraphic', + 'diarytext', # 'basicsample', # This can't be removed due to tasm-recover limitations 'endtextname', 'gungraphic', diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp index f5e4f27379..8250593d63 100644 --- a/engines/dreamweb/dreamgen.cpp +++ b/engines/dreamweb/dreamgen.cpp @@ -1172,7 +1172,7 @@ void DreamGenContext::monkSpeaking() { STACK_CHECK; data.byte(kRoomssample) = 35; loadRoomsSample(); - dx = 1042; + dx = 1003; loadIntoTemp(); clearWork(); showMonk(); @@ -3220,14 +3220,14 @@ void DreamGenContext::getDestInfo() { push(ax); dx = data; es = dx; - si = 1407; + si = 1368; _add(si, ax); cl = es.byte(si); ax = pop(); push(cx); dx = data; es = dx; - si = 1423; + si = 1384; _add(si, ax); ax = pop(); } @@ -3279,7 +3279,7 @@ clearedlocations: bx = ax; dx = data; es = dx; - _add(bx, 1407); + _add(bx, 1368); es.byte(bx) = 0; } @@ -3315,7 +3315,7 @@ void DreamGenContext::execCommand() { es = cs; bx = offset_comlist; ds = cs; - si = 1441; + si = 1402; al = ds.byte(si); _cmp(al, 0); if (!flags.z()) @@ -3408,7 +3408,7 @@ dirroot: si = offset_rootdir; _inc(si); es = cs; - di = 1264; + di = 1225; _inc(di); cx = 12; _movsb(cx, true); @@ -3510,7 +3510,7 @@ notyetassigned: push(bx); _add(bx, 2); ds = cs; - si = 1441; + si = 1402; checkpass: _lodsw(); ah = es.byte(bx); @@ -3581,7 +3581,7 @@ void DreamGenContext::read() { return; okcom: es = cs; - di = 1264; + di = 1225; ax = data.word(kTextfile1); data.word(kMonsource) = ax; ds = ax; @@ -3711,7 +3711,7 @@ keyok2: ds = cs; si = offset_operand1+1; es = cs; - di = 1264+1; + di = 1225+1; cx = 12; _movsb(cx, true); monitorLogo(); @@ -3838,7 +3838,7 @@ void DreamGenContext::parser() { al = '='; _stosb(); ds = cs; - si = 1441; + si = 1402; notspace1: _lodsw(); _cmp(al, 32); @@ -5672,7 +5672,7 @@ void DreamGenContext::getNamePos() { _mul(cx); dx = data; es = dx; - bx = 1575; + bx = 1536; _add(bx, ax); al = data.byte(kCursorpos); ah = 0; @@ -5768,7 +5768,7 @@ void DreamGenContext::showNames() { STACK_CHECK; dx = data; es = dx; - si = 1575+1; + si = 1536+1; di = (60)+21; bx = (52)+10; cl = 0; @@ -6144,7 +6144,7 @@ void DreamGenContext::clearChanges() { di = 0; _stosw(cx, true); es = cs; - di = 1407; + di = 1368; al = 1; _stosb(2); al = 0; @@ -6459,63 +6459,63 @@ void DreamGenContext::__start() { //0x03b0: .... .2.. .... .2.. 0x0b, 0x16, 0x14, 0x00, 0x00, 0x32, 0x14, 0x00, 0x0e, 0x21, 0x28, 0x00, 0x00, 0x32, 0x14, 0x00, //0x03c0: .... .2.. .!(. .2.. - 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x43, 0x30, 0x32, 0x00, 0x44, 0x52, - //0x03d0: .DRE AMWE B.C0 2.DR - 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, - //0x03e0: EAMW EB.V 99.D REAM - 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x34, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, - //0x03f0: WEB. G14. DREA MWEB - 0x2e, 0x54, 0x35, 0x31, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f, - //0x0400: .T51 .DRE AMWE B.VO - 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, - //0x0410: L.DR EAMW EB.G 15.D - 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x49, 0x30, 0x37, 0x00, 0x00, 0x01, 0x45, 0x58, - //0x0420: REAM WEB. I07. ..EX - 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, - //0x0430: IT HELP - 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, - //0x0440: LI ST READ - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, - //0x0450: LO GON - 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, - //0x0460: KEYS .. PUBL - 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, - //0x0470: IC PUBL IC - 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, - //0x0480: . ..BL ACKD RAGO - 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, - //0x0490: N RY AN ... - 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, - //0x04a0: HEND RIX LOUI - 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, - //0x04b0: S . ..SE PTIM - 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, - //0x04c0: US BE CKET T - 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - //0x04d0: ... - 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, - //0x04e0: ."R OOT . - 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, - //0x04f0: " .00 - 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, 0x0a, 0x0d, 0x0a, 0x24, 0x53, 0x50, 0x45, 0x45, 0x43, - //0x0500: 00.0 0... ..$S PEEC - 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, - //0x0510: HR24 C000 5.RA W.OB - 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, - //0x0520: JECT NAM E ON E - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - //0x0530: - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, - //0x0540: .. .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, - //0x0550: .... .... .... ...D - 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - //0x0560: :... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + 0xff, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x39, 0x39, 0x00, 0x44, 0x52, + //0x03d0: .DRE AMWE B.V9 9.DR + 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, 0x2e, 0x56, 0x4f, 0x4c, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, + //0x03e0: EAMW EB.V OL.D REAM + 0x57, 0x45, 0x42, 0x2e, 0x47, 0x31, 0x35, 0x00, 0x44, 0x52, 0x45, 0x41, 0x4d, 0x57, 0x45, 0x42, + //0x03f0: WEB. G15. DREA MWEB + 0x2e, 0x49, 0x30, 0x37, 0x00, 0x00, 0x01, 0x45, 0x58, 0x49, 0x54, 0x20, 0x20, 0x20, 0x20, 0x20, + //0x0400: .I07 ...E XIT + 0x20, 0x48, 0x45, 0x4c, 0x50, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x49, 0x53, 0x54, 0x20, + //0x0410: HEL P L IST + 0x20, 0x20, 0x20, 0x20, 0x20, 0x52, 0x45, 0x41, 0x44, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, + //0x0420: REA D L + 0x4f, 0x47, 0x4f, 0x4e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x4b, 0x45, 0x59, 0x53, 0x20, 0x20, 0x20, + //0x0430: OGON KEY S + 0x20, 0x20, 0x20, 0x01, 0x00, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, + //0x0440: . .PUB LIC + 0x20, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x43, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x42, + //0x0450: PUB LIC ...B + 0x4c, 0x41, 0x43, 0x4b, 0x44, 0x52, 0x41, 0x47, 0x4f, 0x4e, 0x20, 0x52, 0x59, 0x41, 0x4e, 0x20, + //0x0460: LACK DRAG ON R YAN + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x48, 0x45, 0x4e, 0x44, 0x52, 0x49, 0x58, + //0x0470: .. .HEN DRIX + 0x20, 0x20, 0x20, 0x20, 0x20, 0x4c, 0x4f, 0x55, 0x49, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + //0x0480: LOU IS + 0x00, 0x00, 0x00, 0x53, 0x45, 0x50, 0x54, 0x49, 0x4d, 0x55, 0x53, 0x20, 0x20, 0x20, 0x20, 0x42, + //0x0490: ...S EPTI MUS B + 0x45, 0x43, 0x4b, 0x45, 0x54, 0x54, 0x20, 0x20, 0x20, 0x20, 0x00, 0xff, 0xff, 0x20, 0x20, 0x20, + //0x04a0: ECKE TT .. . + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x52, 0x4f, 0x4f, 0x54, + //0x04b0: ." ROOT + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x22, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + //0x04c0: ." + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x30, 0x30, 0x30, 0x30, 0x00, 0x30, 0x30, 0x00, 0x0d, + //0x04d0: .0 000. 00.. + 0x0a, 0x0d, 0x0a, 0x24, 0x53, 0x50, 0x45, 0x45, 0x43, 0x48, 0x52, 0x32, 0x34, 0x43, 0x30, 0x30, + //0x04e0: ...$ SPEE CHR2 4C00 + 0x30, 0x35, 0x2e, 0x52, 0x41, 0x57, 0x00, 0x4f, 0x42, 0x4a, 0x45, 0x43, 0x54, 0x20, 0x4e, 0x41, + //0x04f0: 05.R AW.O BJEC T NA + 0x4d, 0x45, 0x20, 0x4f, 0x4e, 0x45, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + //0x0500: ME O NE + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, + //0x0510: . + 0x10, 0x12, 0x12, 0x11, 0x10, 0x10, 0x10, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + //0x0520: .... .... .... .... + 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + //0x0530: .... .... D:.. .... + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + //0x0540: .... .... .... .... + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + //0x0550: .... .... .... .... + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 0x09, + //0x0560: .... .... .... .... + 0x08, 0x06, 0x0b, 0x04, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x0570: .... .... .... .... - 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x0580: .... .... .... .... - 0x00, 0x03, 0x02, 0x04, 0x01, 0x0a, 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, //0x0590: .... .... .... .... 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x05a0: .... .... .... .... @@ -6527,29 +6527,23 @@ void DreamGenContext::__start() { //0x05d0: .... .... .... .... 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, //0x05e0: .... .... .... .... - 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, 0xff, 0xff, 0xff, //0x05f0: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0600: .... .... .... .... - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0610: .... .... .... .... - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0620: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0630: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0640: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0650: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, //0x0660: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, 0x01, - //0x0670: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x01, - //0x0680: .... .... .... .... - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, - //0x0690: .... .... .... .... - 0x00, }; + 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 0956076b36..bd3b987916 100644 --- a/engines/dreamweb/dreamgen.h +++ b/engines/dreamweb/dreamgen.h @@ -32,15 +32,15 @@ namespace DreamGen { -static const uint16 offset_commandline = 0x051e; -static const uint16 offset_rootdir = 0x04e2; -static const uint16 offset_money2poke = 0x0503; -static const uint16 offset_openchangesize = 0x042c; -static const uint16 offset_keys = 0x046a; -static const uint16 offset_comlist = 0x042e; -static const uint16 offset_money1poke = 0x04fe; -static const uint16 offset_speechfile = 0x0511; -static const uint16 offset_operand1 = 0x04d4; +static const uint16 offset_operand1 = 0x04ad; +static const uint16 offset_keys = 0x0443; +static const uint16 offset_openchangesize = 0x0405; +static const uint16 offset_money1poke = 0x04d7; +static const uint16 offset_rootdir = 0x04bb; +static const uint16 offset_comlist = 0x0407; +static const uint16 offset_money2poke = 0x04dc; +static const uint16 offset_speechfile = 0x04ea; +static const uint16 offset_commandline = 0x04f7; static const uint16 kStartvars = 0; static const uint16 kProgresspoints = 1; static const uint16 kWatchon = 2; @@ -412,23 +412,20 @@ static const uint16 kRoomssample = 516; static const uint16 kGameerror = 517; static const uint16 kHowmuchalloc = 518; static const uint16 kReelroutines = 520; -static const uint16 kCharacterset3 = 977; -static const uint16 kBasicsample = 990; -static const uint16 kDiarygraphic = 1003; -static const uint16 kDiarytext = 1016; -static const uint16 kVolumetabname = 1029; -static const uint16 kMonkface = 1042; -static const uint16 kTitle7graphics = 1055; -static const uint16 kCurrentfile = 1264; -static const uint16 kRoomscango = 1407; -static const uint16 kRoompics = 1423; -static const uint16 kOplist = 1438; -static const uint16 kInputline = 1441; -static const uint16 kPresslist = 1569; -static const uint16 kSavenames = 1575; -static const uint16 kQuitrequested = 1694; -static const uint16 kSubtitles = 1695; -static const uint16 kForeignrelease = 1696; +static const uint16 kBasicsample = 977; +static const uint16 kVolumetabname = 990; +static const uint16 kMonkface = 1003; +static const uint16 kTitle7graphics = 1016; +static const uint16 kCurrentfile = 1225; +static const uint16 kRoomscango = 1368; +static const uint16 kRoompics = 1384; +static const uint16 kOplist = 1399; +static const uint16 kInputline = 1402; +static const uint16 kPresslist = 1530; +static const uint16 kSavenames = 1536; +static const uint16 kQuitrequested = 1655; +static const uint16 kSubtitles = 1656; +static const uint16 kForeignrelease = 1657; static const uint16 kBlocktextdat = (0); static const uint16 kPersonframes = (0); static const uint16 kDebuglevel1 = (0); diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp index be4906c8b2..02a53436fe 100644 --- a/engines/dreamweb/use.cpp +++ b/engines/dreamweb/use.cpp @@ -1160,9 +1160,9 @@ void DreamBase::removeFreeObject(uint8 index) { void DreamGenContext::useDiary() { getRidOfReels(); - loadIntoTemp((const char *)data.ptr(kDiarygraphic, 0)); - loadTempText((const char *)data.ptr(kDiarytext, 0)); - loadTempCharset((const char *)data.ptr(kCharacterset3, 0)); + loadIntoTemp("DREAMWEB.G14"); + loadTempText("DREAMWEB.T51"); + loadTempCharset("DREAMWEB.C02"); createPanel(); showIcon(); showDiary(); -- cgit v1.2.3