Opened 10 years ago

Closed 10 years ago

Last modified 12 months ago

#9091 closed patch

descumm: script output cleanup, match ScummVM

Reported by: SF/jestar_jokin Owned by: fingolfin
Priority: normal Component: Tools
Keywords: Cc:
Game:

Description

This patch improves the script output of descumm.
- Removes question marks from function names.
- Changes roomOps sub-opcode 0x07 from "Unused" to "SetRoomScale", accepting 5 parameters and two aux opcodes. (as per ScummVM)
- findObject looks for bytes or vars, rather than words or vars. (as per ScummVM)
- startScript in SCUMM V3-5 now also outputs characters representing the flags for "freeze resistant" and "recursive" script execution.

Diff is based on revision 44332 from SVN trunk, plus modifications in patch 2867369.

Ticket imported from: #2870543. Ticket imported from: patches/1196.

Attachments (2)

descumm_2870543_incl_287369.diff (9.4 KB ) - added by SF/jestar_jokin 10 years ago.
Includes this patch and patch 2867369
descumm.cpp (79.8 KB ) - added by SF/jestar_jokin 10 years ago.
In case I screwed up making the diff again

Download all attachments as: .zip

Change History (9)

comment:1 by SF/jestar_jokin, 10 years ago

I have updated the diff to include one more change:
- Change method of escaping non-printable ASCII characters. Output changes from "^255^03" to "\xFF\x03". This avoids ambiguities arising from the "^" characters (which in most SCUMM games represents three ellipses, "..."), and also from escaped characters followed by numeric digits (does "^255" mean character 2 followed by the number 55, or character 255?).

comment:2 by fingolfin, 10 years ago

Small side remark: Could you please use "svn diff" to create diffs? That makes it easier to apply & review them :)

comment:3 by fingolfin, 10 years ago

Patch #2867369 has already been applied to trunk rev 44332; nevertheless, this patch fails to apply cleanly. Can you please provide an updated patch?

comment:4 by SF/jestar_jokin, 10 years ago

Sorry, I wasn't sure if I should submit multiple small patches or one monolithic one. Anyway, I'm not sure what's wrong, but I've added an SVN diff of my working copy based on revision 44332 from SVN trunk, and also the entire source file in case I screwed up making the diff again.

by SF/jestar_jokin, 10 years ago

Includes this patch and patch 2867369

by SF/jestar_jokin, 10 years ago

Attachment: descumm.cpp added

In case I screwed up making the diff again

comment:5 by fingolfin, 10 years ago

Owner: set to fingolfin
Status: newclosed

comment:6 by fingolfin, 10 years ago

I actually had to use the descumm.cpp file, somehow the patch refused to apply cleanly, not sure why (I *did* convert the line endings from windows to unix first, too).
Anyway, it's in now, thanks a lot!

comment:7 by digitall, 12 months ago

Component: Tools
Note: See TracTickets for help on using tickets.