Commit Graph
3264 Commits
Author SHA1 Message Date
Travis Howell 905e9bc3ed SCUMM: Add sprite code difference in Moonbase Commander. 2011-08-08 11:41:06 +10:00
Matthew Hoops c05c42ecc6 Merge remote branch 'upstream/master' into soccer 2011-08-07 20:11:27 -04:00
Travis Howell 45dc303159 SCUMM: Fix endian issue in captureWizPolygon. 2011-08-08 09:48:31 +10:00
Johannes Schickel acffd12d07 SCUMM: Further clean up of the CMS code. 2011-08-07 16:49:25 +02:00
Johannes Schickel 26b6fd5930 SCUMM: Clean up CMS code some more. 2011-08-07 16:15:46 +02:00
Johannes Schickel 88354bed23 SCUMM: Mark some overwritten methods as virtual. 2011-08-07 15:58:27 +02:00
Johannes Schickel 6bd9cd33d9 SCUMM: Cleanup CMS code a bit. 2011-08-07 15:56:49 +02:00
Christoph Mallon e35b4f20c1 GRAPHICS: Simplify the interface of Graphics::loadThumbnail().
Now it returns the Surface, so the caller does not need to create one and pass it.
2011-08-07 15:19:09 +02:00
Christoph Mallon 23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Matthew Hoops e43a6671fc SCUMM: Fix some soccer u32 code in op_1011
Spotted by fuzzie
2011-08-06 15:54:11 -04:00
Matthew Hoops 605473d117 SCUMM: Add a few more notes to soccer u32 code 2011-08-06 13:08:56 -04:00
Matthew Hoops 6528f902fc SCUMM: Remove soccer editor-related u32 code
The built-in editor, while could potentially be a cool feature, seems incomplete and unusable. Room 4 (the editor room) in all three games is not accessible without jumping to it.
2011-08-06 13:02:43 -04:00
Eugene Sandulenko 192b245d51 SCUMM: Fix compilation 2011-08-06 11:39:37 +01:00
Eugene Sandulenko 0dafa7f80f ALL: Reduce audio/ header dependency 2011-08-06 11:30:42 +01:00
Eugene Sandulenko 78f1ea7690 OSYSTEM: extended installTimerProc() with timer ID parameter 2011-08-06 11:28:35 +01:00
Eugene Sandulenko c451ae639f SCUMM: Proper fix of Russian subtitles
Initial fix in 11a17b3 (r51211) led to chopped inventory items.
No idea why it does not work with our code, as it seems to match
the disassembly. Thus implementing this hackish workaround.
2011-08-06 11:28:30 +01:00
Johannes Schickel 68b4873559 SCUMM: Properly reset midi channel voice mapping in CMS on new track.
This fixes an ugly dead lock in some cases.
2011-08-06 03:45:40 +02:00
Johannes Schickel 70a694ce43 SCUMM: Remove unneeded members in CMS class. 2011-08-06 03:28:42 +02:00
Johannes Schickel 018e304916 SCUMM: Slight cleanup in CMS code. 2011-08-06 03:28:42 +02:00
Johannes Schickel 5a0eb6ba60 SCUMM: Fix some valgrind warnings in CMS code. 2011-08-06 03:28:42 +02:00
Matthew Hoops ed2563bf35 SCUMM: Mark pass as having CMS support 2011-08-05 18:03:42 -04:00
Matthew Hoops 836f3fa052 SCUMM: Mark monkey1 VGA floppy as having CMS support 2011-08-05 17:29:30 -04:00
Matthew Hoops a63aaec46b SCUMM: Mark Indy3 VGA as having CMS support 2011-08-05 17:15:23 -04:00
Johannes Schickel b86de198a0 SCUMM: Fix up CMS player implementation.
It's much better now and hopefully quite close to the original when it comes
to the music part. The intro music of Loom and Monkey Island 1 EGA sounds fine
to me now at least.
2011-08-05 22:58:50 +02:00
Matthew Hoops bf841e1e94 SCUMM: Fix a few more bugs in soccer u32 op_1014_sub1
Thanks to fuzzie
2011-08-05 13:03:08 -04:00
Matthew Hoops 68f07efa95 SCUMM: Fix another typo in soccer u32 op_1014_sub1 2011-08-05 11:46:21 -04:00
Matthew Hoops 2b92f6df0f SCUMM: Fix minor logic bug in soccer u32 op_1014
Spotted by fuzzie
2011-08-05 11:29:06 -04:00
Matthew Hoops 3b3ab9a502 SCUMM: Add note to soccer u32 op_1011 about cursor scaling 2011-08-05 09:23:18 -04:00
Matthew Hoops 51fc76acd4 SCUMM: Add notes on the unused soccer u32 opcodes
Might be nice to implement the soccer editor one day in the future, but it's definitely a secondary goal. In fact, I'm not even sure how to access it yet other than jumping to the room (4).
2011-08-04 11:02:11 -04:00
Matthew Hoops 2ea594de83 SCUMM: Fix shadows in soccer
Spotted by fuzzie
2011-08-03 11:57:18 -04:00
Matthew Hoops a160179f37 SCUMM: Fix remaining soccer u32 op_1007 bugs
Thanks to fuzzie for snooping that one out.

The field boundaries now work correctly. SoccerMLS/Soccer2004 only are missing proper shadow support now. The original soccer is still having problems with clicking on the field.
2011-08-03 11:14:52 -04:00
Matthew Hoops c36642651e SCUMM: Remove BluesBirthday dependency on the binary
The game scripts detected Yellow or Red variants based on what binary was present. That could potentially cause problems with a Mac dump in case someone dumped into MacBinary format.
2011-08-03 00:15:27 -04:00
Johannes Schickel 4faa2d5b42 SCUMM: Typos... thx clone2727. 2011-08-03 05:15:29 +02:00
Johannes Schickel e1d881a227 SCUMM: Added FIXME to our old AdLib resource conversion code.
We handle command 0x80 incorrectly, which results in sound effects never
looping. This is the cause for bug #2027877 for example. I add this FIXME
since it is (probably) non-trivial to fix and so it won't be forgotten.
2011-08-03 05:10:24 +02:00
Matthew Hoops 743ed0517b SCUMM: Implement soccer u32 op_1017
Used sporadically during gameplay
2011-08-02 16:57:44 -04:00
Matthew Hoops 6d6192b9f7 SCUMM: Fix soccer u32 op_1007 atan2 calls
The games are now becoming playable. Players and the ball appear on the field. However they go off the field at times and shadows do not work properly yet. It's progress though!

Thanks to fuzzie for spotting
2011-08-02 16:45:17 -04:00
Matthew Hoops 6d5d5f8269 SCUMM: Fix some more soccer u32 logic bugs
The camera now pans correctly. The players/ball have yet to reappear on the field, however. Thanks to fuzzie for spotting
2011-08-02 16:11:29 -04:00
Matthew Hoops 42c359a879 SCUMM: Fix op_1011 parameters 2011-08-02 14:38:02 -04:00
Matthew Hoops 96307dc2d8 SCUMM: Implement soccer u32 op_1016
Used when a goal is scored
2011-08-02 13:49:00 -04:00
Matthew Hoops 6a31b57d39 SCUMM: Fix more bugs in soccer u32 spotted by fuzzie 2011-08-02 13:35:25 -04:00
Matthew Hoops b609004ba2 SCUMM: Fix several soccer u32 logic bugs
Spotted by fuzzie
2011-08-02 11:39:04 -04:00
Matthew Hoops 8259365f1f SCUMM: Add code for remaining soccer u32 opcodes
While it should be complete now, it doesn't quite work properly yet. I need to go back through and double-check everything to make sure I got it right.
2011-07-31 22:41:09 -04:00
clone2727 6370984b22 Merge pull request #50 from clone2727/bink
Add support for Bink video to SCUMM HE
2011-07-18 16:04:39 -07:00
Johannes Schickel 69adb13c2f SCUMM: Fix strange noise in Indy4 outro with AdLib/FM-Towns output.
Formerly we tried to play back a ROL resource on AdLib in this case, since the
game does not contain a ADL resource for the sound the game tries to play here.
The original does not exhibit this behavior, thus I changed it to behave the
same now.

Big thanks to eriktorbjorn for noticing and finding the cause of this problem.
Also thanks to Kirben for checking how the original behaved and _athrxx for
checking the FM-Towns version of Indy4.
2011-07-17 02:27:33 +02:00
Johannes Schickel 8800794f4d SCUMM: Clarify PC Speaker style sound resource handling with a comment. 2011-07-17 00:08:52 +02:00
Johannes Schickel 482fcea8f3 SCUMM: Add debug output in case the code tries to set up a non-existant iMuse instrument. 2011-07-14 01:09:47 +02:00
athrxx ed3fe4372a SCUMM: fix regression caused by recent sjis code changes 2011-07-14 00:53:03 +02:00
Johannes Schickel f814dc971c SCUMM: Handle default instrument set up in iMuse like the original. 2011-07-14 00:49:32 +02:00
Johannes Schickel 9565af1ae4 SCUMM: Implement iMuse alloc part command closer to the original. 2011-07-14 00:49:32 +02:00
Matthew Hoops a50abde1b1 BUILD: Allow for disabling Bink support 2011-07-13 12:08:26 -04:00