Opened 16 years ago

Closed 16 years ago

Last modified 6 years ago

#8837 closed patch

PlayStation2 ScummVM-0.11.1 patch

Reported by: sunmax Owned by: sev-
Priority: normal Component: Port: PS2
Version: Keywords:
Cc: Game:


Hi there,

here comes the 'ugly' patch with all the tricks and the debug still in. As agreed with Max and Eugene I am submitting this one for the tag, and a clean one by the end of the week-end.

This applies cleanly against branch-0-11-0 (30918).

You just need to "mkdir elf" in the ps2 folder, and "make -f Makefile.ps2" inside of it to enjoy the magic of the updated PS2 version.

Oh, what really matters: I fixed the savegames ;-)

And successfully savad and loaded with:

- comi - dig - kyra - inherit

Not too bad as a start, no? ;-)

Desperately need to go to bed.

G'nite, -max

Ticket imported from: #1900179. Ticket imported from: patches/942.

Attachments (1)

branch-0-11-0-ps2.patch (135.2 KB ) - added by sunmax 16 years ago.
PlayStation2 ScummVM-0.11.1 patch

Download all attachments as: .zip

Change History (9)

by sunmax, 16 years ago

Attachment: branch-0-11-0-ps2.patch added

PlayStation2 ScummVM-0.11.1 patch

comment:1 by sev-, 16 years ago

This patch introduces much more files under Academic Free license now which is incompatible with GPL.

It looks like the author of USB keyboard driver is our Pixel. Perhaps it would be good to ask his permission to dual license it.

Also I see that only change besides backends/ps2 is kyra2/resource.cpp which is completely fine.

Thank you for looking at our code formatting rules. Only note I have is that those C style comments could generate warning with some C++ compilers.

Good work.

comment:2 by sev-, 16 years ago

Owner: set to fingolfin

comment:3 by sev-, 16 years ago

Well, according to and after talking with Pixels, I assume that we are safe with using of these files.

Max, so if you have no objections, I would commit it before tagging.

comment:4 by fingolfin, 16 years ago

Looks mostly good to me. Some caveats:

* In backends/platform/ps2/ps2input.cpp, the code was changed back to use SDLK_F1 etc. instead of Common::KEYCODE_F1. This is not good, but for now shouldn't cause a problem. On the long run, though, it might... This affects various other files, e.g. backends/platform/ps2/sdlkeys.h was re-added, even though it was removed beforehand on purpose... Hm, why?

* In backends/platform/ps2/ps2time.cpp, my FIXME comment was removed. Why? It's OK that you don't want to properly fix the evil localtime() hack for now, but in the end, it will in fact *simplify* the code to properly implement OSystem::getTimeAndDate and get rid of that hack. So, I would certainly leave that hack in. But maybe this was only reverted by accident?

* In backends/platform/ps2/savefile.cpp, the dummy code ( "results.push_back("dig.s00");") should be removed.

I don't insist on those being fixed before the commit, but at some point these all need to be addressed.

comment:5 by sev-, 16 years ago

Committed to the branch. Mentioned change for Kyra engine is not needed in the trunk, though.

comment:6 by sev-, 16 years ago

Owner: changed from fingolfin to sev-
Status: newclosed

comment:7 by fingolfin, 16 years ago

But please don't forget about the fixes I asked for :)

comment:8 by digitall, 6 years ago

Component: Port: PS2
Note: See TracTickets for help on using tickets.