Opened 15 years ago

Closed 15 years ago

Last modified 13 months ago

#8365 closed patch

Updates for Kyra

Reported by: lordhoto Owned by: SF/ender
Priority: normal Component: Engine: Kyra
Keywords: Cc:
Game:

Description

Hi,

I have made some patches for the Kyra CVS code.
New is currently:
- support for Movies from Kyrandia 1 CD version
- support for .XMI music
- some patches to the script code(fixed stack bugs)
- changes all whitespaces in codecs.cpp to tabs
- added a small hardcoded demo for the movie renderer
- some other fixes

Ticket imported from: #1051358. Ticket imported from: patches/470.

Attachments (6)

midiparser-kyra.patch (1.5 KB ) - added by lordhoto 15 years ago.
Changes some things from the midiparser else sound will not work
kyra-v1.patch.gz (12.2 KB ) - added by lordhoto 15 years ago.
Patch to the CVS code
kyra-v1newfiles.tar.gz (2.2 KB ) - added by lordhoto 15 years ago.
New files (for sound)
kyra-v2.patch.gz (13.5 KB ) - added by lordhoto 15 years ago.
Deleted some unused tabs and whitespaces
kyra-v3.patch.gz (13.9 KB ) - added by lordhoto 15 years ago.
Full patch includes all files
codecs-v1.patch (671 bytes ) - added by lordhoto 15 years ago.
Patch on top of the kyra-v3.patch.gz file

Download all attachments as: .zip

Change History (19)

by lordhoto, 15 years ago

Attachment: midiparser-kyra.patch added

Changes some things from the midiparser else sound will not work

by lordhoto, 15 years ago

Attachment: kyra-v1.patch.gz added

Patch to the CVS code

by lordhoto, 15 years ago

Attachment: kyra-v1newfiles.tar.gz added

New files (for sound)

by lordhoto, 15 years ago

Attachment: kyra-v2.patch.gz added

Deleted some unused tabs and whitespaces

comment:1 by fingolfin, 15 years ago

Some remarks:
* there are four attached files, three of them patches - so
which do we have to apply where? Might be easier if you just
put it all together into one big patch :-)
* The MidiParser patch looks fishy. Are you sure the MIDI
data uses more than 32 tracks? These two changes you have to
make there could also be caused by parse errors of the MIDI
data (e.g. because the MIDI data is in a different format
after all..). I.e. right now this looks to me as if it cures
the symptoms, not the cause
* I fixed the whitespace in codecs.cpp manually now, so this
can be left out of the patch (i actually did this some time
ago and forgot to commit that file)
* the new source files are missing a legal header (compare
with other ScummVM sources).

comment:2 by fingolfin, 15 years ago

Owner: set to SF/ender

comment:3 by lordhoto, 15 years ago

you have to unpack "kyra-v1newfiles.tar.gz" first, than you
apply "midiparser-kyra.patch" and after it "kyra-v2.patch".

Yes Kyrandia .XMI file are using 120 tracks but some of them
are blanc. I tested it with a other program.

And I have no problem with a missing header (tested it before),
maybe you forget to "unpack kyra-v1newfiles.tar.gz".

by lordhoto, 15 years ago

Attachment: kyra-v3.patch.gz added

Full patch includes all files

comment:4 by lordhoto, 15 years ago

Now I added a patch which creates the new files and patches
the old.

comment:5 by lordhoto, 15 years ago

Ah before you apply kyra-v3.patch over the old I tell you,
you have to apply it to a vaild copy of the CVS code. (thx
to _sev for testing it :))

comment:6 by fingolfin, 15 years ago

A "legal header" is not the same as a "header file", LordHoto. Look at the
start of any ScummVM source file to see the legal header included in
every single one :-).

comment:7 by SF/ender, 15 years ago

To clarify:

The standard GPL comment-block we have at the beginning of
every source file also needs to be placed on all new source
files.

comment:8 by lordhoto, 15 years ago

ah you mean this...

fingolfin: I tested your memmove idea but i got very strange
'bugs' with it. Sometimes it workes perfectly the othertime
always segfaults. I think we should use the while method.

So I did a patchfile for the kyra/codecs.cpp only

by lordhoto, 15 years ago

Attachment: codecs-v1.patch added

Patch on top of the kyra-v3.patch.gz file

comment:9 by SF/ender, 15 years ago

I'm working on applying this now - sorry, I was sick most of the
week :)

comment:10 by SF/ender, 15 years ago

Okay, the patch has been applied apart from the midiparser
changes. With kyra1cd I'm getting some very weird crashes
(and still no music) with or without that change... so I want to
find that problem before applying that one.

comment:11 by SF/ender, 15 years ago

Closing this for now.

comment:12 by SF/ender, 15 years ago

Status: newclosed

comment:13 by digitall, 13 months ago

Component: Engine: Kyra
Note: See TracTickets for help on using tickets.