libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: fixed occasional stripping of the strings in data segment

Browse Source
This commit is contained in:
Vladimir Menshakov 2011-06-13 15:22:14 +04:00 committed by Alyssa Milburn
parent f46a889e6d
commit 49e7c7a735
5 changed files with 459 additions and 442 deletions
devtools/tasmrecover/tasm
lex.pyparser.py
engines/dreamweb
dreamgen.cppdreamgen.hdreamweb.cpp

2
devtools/tasmrecover/tasm/lex.py

@ -41,7 +41,7 @@ def parse_args(text):
break
token += c
token = token.strip()
#token = token.strip()
if len(token):
result.append(token)
#print result

16
devtools/tasmrecover/tasm/parser.py

@ -169,15 +169,17 @@ class parser:
if len(line) == 0 or line[0] == ';' or line[0] == chr(0x1a):
continue
#print cmd
#print line
m = re.match('(\w+)\s*?:', line)
if m is not None:
line = line[len(m.group(0)):]
line = line[len(m.group(0)):].strip()
if self.visible():
name = m.group(1)
if self.proc is not None:
self.proc.add_label(name)
print "offset %s -> %d" %(name, len(self.binary_data))
self.set_offset(name, (len(self.binary_data), self.proc, len(self.proc.stmts) if self.proc is not None else 0))
#print line
cmd = line.split()
if len(cmd) == 0:
@ -198,8 +200,8 @@ class parser:
continue
if cmd0 == 'db' or cmd0 == 'dw' or cmd0 == 'dd':
arg = " ".join(cmd[1:])
print "%d: %s" %(len(self.binary_data), line) #fixme: COPYPASTE
arg = line[len(cmd0):].strip()
print "%d:1: %s" %(len(self.binary_data), arg) #fixme: COPYPASTE
binary_width = {'b': 1, 'w': 2, 'd': 4}[cmd0[1]]
self.binary_data += self.compact_data(binary_width, lex.parse_args(arg))
continue
@ -223,10 +225,12 @@ class parser:
v = cmd[2]
self.set_global(cmd0, op.const(self.fix_dollar(v)))
elif cmd1 == 'db' or cmd1 == 'dw' or cmd1 == 'dd':
print "%d: %s" %(len(self.binary_data), line)
binary_width = {'b': 1, 'w': 2, 'd': 4}[cmd1[1]]
offset = len(self.binary_data)
self.binary_data += self.compact_data(binary_width, lex.parse_args(" ".join(cmd[2:])))
arg = line[len(cmd0):].strip()
arg = arg[len(cmd1):].strip()
print "%d: %s" %(offset, arg)
self.binary_data += self.compact_data(binary_width, lex.parse_args(arg))
self.set_global(cmd0.lower(), op.var(binary_width, offset))
continue
elif cmd1 == 'proc':

843
engines/dreamweb/dreamgen.cpp

File diff suppressed because it is too large Load Diff

36
engines/dreamweb/dreamgen.h

@ -531,23 +531,23 @@ namespace dreamgen {
const static uint16 kTitle6graphics = 2455;
const static uint16 kTitle7graphics = 2468;
const static uint16 kPalettescreen = 2481;
const static uint16 kCurrentfile = 2892;
const static uint16 kDmaaddresses = 4945;
const static uint16 kFileheader = 5862;
const static uint16 kFiledata = 5912;
const static uint16 kExtradata = 5952;
const static uint16 kRoomdata = 5958;
const static uint16 kMadeuproomdat = 7750;
const static uint16 kRoomscango = 7782;
const static uint16 kRoompics = 7798;
const static uint16 kOplist = 7813;
const static uint16 kInputline = 7816;
const static uint16 kLinedata = 7944;
const static uint16 kPresslist = 8344;
const static uint16 kSavenames = 8350;
const static uint16 kSavefiles = 8469;
const static uint16 kRecname = 8560;
const static uint16 kStak = 8573;
const static uint16 kCurrentfile = 2970;
const static uint16 kDmaaddresses = 5118;
const static uint16 kFileheader = 6059;
const static uint16 kFiledata = 6109;
const static uint16 kExtradata = 6149;
const static uint16 kRoomdata = 6155;
const static uint16 kMadeuproomdat = 7947;
const static uint16 kRoomscango = 7979;
const static uint16 kRoompics = 7995;
const static uint16 kOplist = 8010;
const static uint16 kInputline = 8013;
const static uint16 kLinedata = 8141;
const static uint16 kPresslist = 8541;
const static uint16 kSavenames = 8547;
const static uint16 kSavefiles = 8666;
const static uint16 kRecname = 8757;
const static uint16 kStak = 8770;
const static uint16 kBlocktextdat = (0);
const static uint16 kPersonframes = (0);
const static uint16 kDebuglevel1 = (0);
@ -624,10 +624,10 @@ namespace dreamgen {
const static uint16 kOpsy = (52);
const static uint16 kSymboly = (56);
const static uint16 kInventy = (58);
const static uint16 kHeaderlen = (5958-5862);
const static uint16 kMenuy = (60);
const static uint16 kOpsx = (60);
const static uint16 kMaplength = (60);
const static uint16 kHeaderlen = (6155-6059);
const static uint16 kSymbolx = (64);
const static uint16 kSetdatlen = (64*128);
const static uint16 kMapwidth = (66);

4
engines/dreamweb/dreamweb.cpp

@ -248,7 +248,7 @@ void DreamWebEngine::keyPressed(uint16 ascii) {
if (ascii >= 'a' && ascii <= 'z')
ascii = (ascii - 'a') + 'A';
debug(1, "key pressed = %04x", ascii);
uint8* keybuf = _context.data.ptr(5715, 16); //fixme: some hardcoded offsets are not added as consts
uint8* keybuf = _context.data.ptr(5912, 16); //fixme: some hardcoded offsets are not added as consts
uint16 in = (_context.data.word(dreamgen::kBufferin) + 1) & 0x0f;
uint16 out = _context.data.word(dreamgen::kBufferout);
if (in == out) {
@ -807,7 +807,7 @@ void showpcx(Context &context) {
pcxFile.seek(16, SEEK_SET);
context.es = context.data.word(kBuffers);
maingamepal = context.es.ptr(4782, 768);
maingamepal = context.es.ptr(4782, 768); //fixme: hardcoded offset
pcxFile.read(maingamepal, 48);
memset(maingamepal + 48, 0xff, 720);