15977 Commits

Author SHA1 Message Date
Martin Kiewitz
aa4ae667a9 SCI: use priority when queuing up music in sound sci0 -> fixes lsl3 jingle issues
svn-id: r49156
2010-05-23 12:22:23 +00:00
Torbjörn Andersson
1b294306dd Another video player regression: When the palette changes, look up the
lightest/darkest available colours to use as white/black for the subtitles. It
is possible that we could get away with fixed values for Broken Sword 2, since
it has always had subtitles. But for Broken Sword 1, subtitles is a ScummVM
addition, and we can't.

svn-id: r49154
2010-05-23 11:16:10 +00:00
Torbjörn Andersson
8ed56e1834 Keep the Broken Sword cutscene players from using up all available CPU.
Probably a regression from the recent video decoder rewrite, but I haven't
checked if it also present in other engines.

svn-id: r49153
2010-05-23 10:50:14 +00:00
Filippos Karapetis
c874ff15a8 Cleaned up the game ID code:
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
2010-05-23 10:28:03 +00:00
Paul Gilbert
dd9bf70761 Major work done on the animation and support classes to match the original
svn-id: r49150
2010-05-23 07:20:40 +00:00
Martin Kiewitz
d04c7a58aa SCI: adding ability to specify hexadecimal number as index for debug command vmvars - also report error if invalid index is given to us
svn-id: r49148
2010-05-22 21:46:40 +00:00
Nicola Mettifogo
5f2a88e596 Cleanup (removed more Parallaction::getGameType() calls).
svn-id: r49147
2010-05-22 18:00:16 +00:00
Nicola Mettifogo
95f6a71f36 Cleanup (removed many Parallaction::getGameType() calls).
svn-id: r49146
2010-05-22 17:59:49 +00:00
Nicola Mettifogo
2f5cb946bb Finish implementation of hitZone and related functions as from the original code.
svn-id: r49145
2010-05-22 17:59:33 +00:00
Nicola Mettifogo
b4813f9b18 Apply patch 3004687 by fuzzie: allow usage of merge zones.
svn-id: r49144
2010-05-22 17:59:16 +00:00
Filippos Karapetis
80ffcc621d Cleanup
svn-id: r49143
2010-05-22 16:54:13 +00:00
Filippos Karapetis
9b6a3712d6 Rewrote and simplified the game ID detector. It now properly works with SCI0-SCI2.1 games
svn-id: r49142
2010-05-22 16:50:15 +00:00
Nicola Mettifogo
45a5c29cdf Apply patch 3005433 by fuzzie: new 'toggleglobalflags' command for the debugger.
svn-id: r49141
2010-05-22 15:56:27 +00:00
Nicola Mettifogo
866e15e8b2 Apply patch 3004991 by fuzzie: don't try and run dialogues for SPEAK zones without dialogue, but run the command list anyway.
svn-id: r49140
2010-05-22 15:56:09 +00:00
Nicola Mettifogo
1b6d9c86e2 Make sure a dialogue is valid before entering dialogue mode.
svn-id: r49139
2010-05-22 15:30:18 +00:00
Nicola Mettifogo
d56352cbd5 Use the kZoneYourself flag to check zones for self-use in BRA. See patch 3003626.
svn-id: r49138
2010-05-22 12:37:07 +00:00
Nicola Mettifogo
a8ea833941 Do not make the character walk towards the zone clicked upon by the user if it is marked for self-use. See patch 3003626.
svn-id: r49137
2010-05-22 12:36:52 +00:00
Nicola Mettifogo
5280cbbbcd Added descriptions for kFlagsSelfuse and kFlagsYourself. See patch 3003626.
svn-id: r49136
2010-05-22 12:36:36 +00:00
Nicola Mettifogo
bc479f8aef Make sure hitZone always gets absolute game coordinates. Based on the patch 3004658 by fuzzie.
svn-id: r49135
2010-05-22 03:49:22 +00:00
Filippos Karapetis
6408504c93 Slight cleanup
svn-id: r49129
2010-05-21 13:31:45 +00:00
Nicola Mettifogo
1c579dc0ac Fix loading of MSC files on big-endian systems. Patch 3004367 by fuzzie.
svn-id: r49128
2010-05-21 12:39:54 +00:00
Nicola Mettifogo
8b20f16378 Added a new valid EOL character for scripts. Patch 3004990 by fuzzie.
svn-id: r49127
2010-05-21 11:05:18 +00:00
Filippos Karapetis
e6ede6bba1 Removed the reliance on the segment manager from the fallback detector, for SCI0-SCI1 games (it still doesn't work with SCI1.1 and newer games, though)
svn-id: r49126
2010-05-21 07:51:47 +00:00
Filippos Karapetis
20fcedc34a Some further work on the fallback detector, reducing the reliance on the segment manager
svn-id: r49125
2010-05-21 07:30:37 +00:00
Matthew Hoops
ad42fa0b2d The QuickTime getPalette() function should output in RGB format, not RGBA.
svn-id: r49121
2010-05-20 18:45:12 +00:00
Matthew Hoops
2e0fdda51f Add a pause level system to VideoDecoder (blatantly ripped off from Engine) and adapt Mohawk to it.
svn-id: r49120
2010-05-20 18:38:06 +00:00
Matthew Hoops
f76f64774a Add initial support for T7G Mac MIDIs. Compressed MIDI is not yet supported.
svn-id: r49119
2010-05-20 17:22:45 +00:00
Jordi Vilalta Prat
fd5000fb79 Groovie: Add support for MT-32 custom instruments
svn-id: r49117
2010-05-20 15:16:09 +00:00
Martin Kiewitz
5f8778395a SCI: fix regression of r49109 - only queue up midi sounds
svn-id: r49114
2010-05-20 06:11:46 +00:00
Martin Kiewitz
a0db16294a SCI: adding workaround for some underwater rooms in iceman - removing visual&priority lines that appear because of non dither mode (would merge with dithered fill color combination normally)
svn-id: r49113
2010-05-20 05:48:37 +00:00
Jordi Vilalta Prat
75992f856c Groovie: Tweak a filename of the Mac version of T7G
svn-id: r49112
2010-05-20 00:10:53 +00:00
Filippos Karapetis
678411ae5e Slight bugfix in the object iteration inside getSierraGameId()
svn-id: r49110
2010-05-19 23:29:27 +00:00
Martin Kiewitz
264fde962b SCI: sound code now queues up music in sci0, wip-code: not reacting on priority yet - fixes iceman room 14
svn-id: r49109
2010-05-19 21:10:43 +00:00
Martin Kiewitz
e243c87fc0 SCI: updated comment on kDoSound(12)
svn-id: r49108
2010-05-19 19:41:10 +00:00
Filippos Karapetis
9675bf2e7a Reverted commit #49088, seems like to be a false positive from MSVC on the QTPlayer::*func pointer of the ParseTable struct (warning 4121, alignment of a member was sensitive to packing)
svn-id: r49106
2010-05-19 17:18:20 +00:00
Nicola Mettifogo
f84b232443 Add a parser for HEAR zones in BRA, and handle the relative MUSIC command. Patch 3003382 by fuzzie, with enhancements.
svn-id: r49105
2010-05-19 17:16:15 +00:00
Filippos Karapetis
92c1f4625d Fixed silly typo in #49099. Iceman works again (thanks m_kiewitz)
svn-id: r49104
2010-05-19 17:11:15 +00:00
Nicola Mettifogo
cbee7eebd4 Do not try and run dialogues when there is no dialogue defined in a SPEAK zone. Patch 3003382 by fuzzie.
svn-id: r49103
2010-05-19 16:54:42 +00:00
Filippos Karapetis
480e5c8488 Added a new method to the resource manager, to help determine if we got a SCI1.1 Mac game. Started rewriting the fallback detector so that it doesn't rely on the segment manager to find the internal game ID
svn-id: r49102
2010-05-19 15:57:58 +00:00
Martin Kiewitz
3f10841ae8 SCI: removed cmdStopAllSounds(), can't be right - added FIXME - fixes iceman room 14 music stopping within 1-2 seconds
svn-id: r49101
2010-05-19 14:54:39 +00:00
Filippos Karapetis
893af1600a Fixed signed/unsigned warning, changed to CamelCase
svn-id: r49100
2010-05-19 14:45:56 +00:00
Filippos Karapetis
d1f1c71f50 Cleaned up script_instantiate_sci0()
svn-id: r49099
2010-05-19 14:43:16 +00:00
Martin Kiewitz
9b4f352870 SCI: cleanup soundcode - number renamed to resourceId, prio renamed to priority
svn-id: r49098
2010-05-19 14:19:16 +00:00
Martin Kiewitz
bb10dabe90 SCI: changing debugger commands to not require "?"-prefix for objects anymore. It's now also possible to use 0x prefix for hexadecimal values e.g. "vo 0x13", "vo 13h", "vo theSound", "vo 12f:34f" is now possible
svn-id: r49097
2010-05-19 13:32:27 +00:00
Eugene Sandulenko
15c533d2c2 Implement FR #2841445: FW: Restart doesn't work
svn-id: r49096
2010-05-19 12:34:10 +00:00
Eugene Sandulenko
2be9bb3d5f Implement FR #2841494: FW: Pause doesn't work
svn-id: r49095
2010-05-19 12:17:59 +00:00
Filippos Karapetis
209798474b Updated the save game format for the changes in #49093
svn-id: r49094
2010-05-19 09:39:11 +00:00
Filippos Karapetis
174a043aa7 Removed the exportsAreWide variable from the segment manager and save games, and moved validateExportFunc() in the Script class, thus resolving a TODO
svn-id: r49093
2010-05-19 08:50:24 +00:00
Filippos Karapetis
852cb16c49 Moved the breakpoint information inside the DebugState struct
svn-id: r49092
2010-05-19 07:25:06 +00:00
Filippos Karapetis
9af44c9332 Added packing to the QT structures
svn-id: r49088
2010-05-19 00:25:12 +00:00