Commit Graph
7940 Commits
Author SHA1 Message Date
Martin Kiewitz 0db75cd812 SCI: Typo fixed in SciEvent caused all Ctrl keys to get changed to Ctrl-Alt-X :)
svn-id: r46257
2009-12-04 18:41:16 +00:00
Martin Kiewitz 3db1912759 SCI: Renamed "buckybits" to "modifiers" in SciEvent
svn-id: r46256
2009-12-04 18:02:48 +00:00
Martin Kiewitz d982d10505 SCI: Make event constants more verbose
svn-id: r46255
2009-12-04 17:58:26 +00:00
Martin Kiewitz 4fb779dbaf SCI: Recreate SciEvent on loading saves
svn-id: r46253
2009-12-04 17:42:32 +00:00
Martin Kiewitz a5f1808c83 SCI: SciEvent created, kernel_sleep() created
svn-id: r46252
2009-12-04 17:38:24 +00:00
Martin Kiewitz 055c8b087b SCI: Alt translation. Currently handles Ctrl-X as Ctrl-Alt-X so that bypassing questions in lsl1vga is possible. ScummVM currently doesn't give us event for Ctrl-Alt-X
svn-id: r46251
2009-12-04 14:32:32 +00:00
Martin Kiewitz dde8743923 SCI: Convert characters to scancode, when Ctrl is pressed (fixes key-shortcuts not working in lsl5, lsl1, qfg1vga and others)
svn-id: r46249
2009-12-04 13:49:43 +00:00
Martin Kiewitz 43abd8d2e9 SCI: Fixed kSetCursor (fixes qfg1vga menu immediately disappearing after opening)
svn-id: r46248
2009-12-04 12:55:53 +00:00
Martin Kiewitz e149a88b99 SCI: Don't call SciMusic for volume changes when using old code
svn-id: r46247
2009-12-03 22:32:48 +00:00
Martin Kiewitz c70a9e2cac SCI: Dont init sound when using old sfx code (fixes assert)
svn-id: r46246
2009-12-03 22:24:29 +00:00
Martin Kiewitz 2dcbfeb31a SCI: Reverting 46242, wasn't a bug at all
svn-id: r46243
2009-12-02 22:13:56 +00:00
Martin Kiewitz 568f674c80 SCI: WindowMgr init correction
svn-id: r46242
2009-12-02 22:00:29 +00:00
Martin Kiewitz afee877c46 SCI: Do clipping on celNo for case when celNo is below 0 (fixes crash in island dr. brain intro)
svn-id: r46240
2009-12-02 21:30:43 +00:00
Torbjörn Andersson 039d7d5e1c Removed unnecessary semi-colons.
svn-id: r46232
2009-12-01 19:19:58 +00:00
Martin Kiewitz df422c0894 SCI: Fix kSetCursor (Sci1.1) to behave like Sierra Sci (fixes cursor hiding/showing in kq6)
svn-id: r46224
2009-11-30 19:34:45 +00:00
Johannes Schickel 798f3ab795 Comment out unused variables.
svn-id: r46198
2009-11-29 17:31:17 +00:00
Filippos Karapetis 3cedd0f2b9 Started assigning the code from Greg's SCI engine to our sound commands - still WIP
svn-id: r46197
2009-11-29 14:48:15 +00:00
Filippos Karapetis dc22fc1c9e Properly update the sound state in the sound command parser when loading a game
svn-id: r46196
2009-11-29 14:44:12 +00:00
Martin Kiewitz bdddab7bd7 SCI/newgui: handling of right aligned menu text changed
svn-id: r46193
2009-11-29 13:42:14 +00:00
Filippos Karapetis 64d76a9e5a Removed unused code
svn-id: r46192
2009-11-29 13:08:40 +00:00
Filippos Karapetis 67a96069a4 Removed unused code
svn-id: r46183
2009-11-29 00:23:14 +00:00
Max Horn 4e153c2f9e SCI: Turn SfxPlayer::_mutex from a pointer into a plain member
svn-id: r46157
2009-11-26 16:11:45 +00:00
Filippos Karapetis 4a1080a597 Removed dead code
svn-id: r46150
2009-11-26 08:19:56 +00:00
Max Horn df651bf20f Added Doxygen comments for the various engine namespaces (currently mostly without details; help filling these out is welcome)
svn-id: r46128
2009-11-24 22:10:14 +00:00
Max Horn 65eae0b53e SCI: Reduce header interdependency
svn-id: r46118
2009-11-23 23:55:19 +00:00
Filippos Karapetis 09f7df09e6 Added a sanity check to the setCursor detection
svn-id: r46087
2009-11-22 15:22:23 +00:00
Filippos Karapetis 054dd568a4 Check which DoSound method is actually invoked from Sound::play, to remove a hack for Jones CD. Added code to handle games which don't actually call SetCursor inside Game::setCursor (like KQ5CD)
svn-id: r46086
2009-11-22 15:06:32 +00:00
Filippos Karapetis bada077c26 Removed duplicate code and simplified some feature detection
svn-id: r46038
2009-11-21 15:41:01 +00:00
Filippos Karapetis fd116847bd Fixed sound detection for Jones CD
svn-id: r46030
2009-11-20 23:37:56 +00:00
Filippos Karapetis ece0444f9c Changed some comments back to DOxygen (inline) style and removed some more dead code
svn-id: r46029
2009-11-20 22:41:17 +00:00
Filippos Karapetis 10fbefcd60 Simplified the doSound detection a bit
svn-id: r46028
2009-11-20 22:39:57 +00:00
Filippos Karapetis dac154e76c Removed dead code
svn-id: r46027
2009-11-20 22:38:50 +00:00
Filippos Karapetis 8b4dabea83 Fixed game restarting regression
svn-id: r46026
2009-11-20 21:50:17 +00:00
Filippos Karapetis c5a7208975 Fixed a regression in the LSL1 and LSL5 demos, which should work correctly now. Some cleanup
svn-id: r46020
2009-11-20 20:32:25 +00:00
Filippos Karapetis 57c87745e1 Removed the syncTime and syncCue selectors from the list of static selectors, along with their relevant FIXMEs. These selectors are used for lip syncing in CD talkie games, which always got a selector vocabulary, so we don't need to hardcode them. Did some further simplification/rewrite of the static selector tables
svn-id: r46019
2009-11-20 20:30:31 +00:00
Filippos Karapetis 85b44876ea Added a FIXME for the syncTime and syncCue selectors, for games which don't have a default selector dictionary
svn-id: r46013
2009-11-20 16:48:51 +00:00
Filippos Karapetis cf1d7f9259 - Removed the non-static selectors "overlay" and "setCursor" from the list of static selectors and introduced a new method for discovering the relevant features when selectors are missing - currently used for determining the graphics functions and setCursor types
- Simplified setCursor detection a bit

svn-id: r46012
2009-11-20 16:39:31 +00:00
Filippos Karapetis 22c09f521a Removed more unused selectors - the canBeHere selector is replaced by cantBeHere in SCI1+
svn-id: r46011
2009-11-20 15:31:08 +00:00
Filippos Karapetis 1ea30ca176 Removed more unused selectors
svn-id: r46010
2009-11-20 15:17:14 +00:00
Filippos Karapetis 662fc11d67 Check the overridden game object when performing setCursor detection, which properly fixes KQ5CD (thanks waltervn)
svn-id: r46009
2009-11-20 15:16:03 +00:00
Filippos Karapetis 94c8f77faa Added a game-specific workaround for setCursor detection in KQ5CD: the code for the setCursor selector has not been rewritten yet to use cursor views (it's the same as lsl3 and sq3, for example), but the game does use cursor views
svn-id: r46008
2009-11-20 14:51:15 +00:00
Filippos Karapetis 7d3501397d Formatting
svn-id: r46007
2009-11-20 14:47:43 +00:00
Filippos Karapetis 551ca5f2c0 Changed the lofs detection to iterate through all the methods of the Game object again, instead of a specific selector - fixes Jones
svn-id: r46006
2009-11-20 14:17:47 +00:00
Filippos Karapetis e7820f972d Selector cleanup: rearranged all selectors to be in the same order as in Sierra's dictionary files, and removed several unused selectors
svn-id: r46005
2009-11-20 13:29:42 +00:00
Filippos Karapetis d1616ea74e Added a sanity check to prevent a crash in LB1 and KQ4 (needs proper fixing)
svn-id: r46003
2009-11-20 11:08:19 +00:00
Filippos Karapetis 893a8bb808 Some corrections for the lofs autodetection - SQ4 floppy works again
svn-id: r46002
2009-11-20 10:29:42 +00:00
Filippos Karapetis 2f6ded8727 Shifted some code around
svn-id: r46001
2009-11-20 08:55:35 +00:00
Filippos Karapetis 81d3a24cce - Rewrote the lofs parameter type auto-detection code
- Renamed dissectSelector -> autodetectFeature

svn-id: r46000
2009-11-20 08:52:32 +00:00
Filippos Karapetis 1063a029a5 Typo
svn-id: r45999
2009-11-20 07:35:48 +00:00
Filippos Karapetis f1036e47ad - Simplified the different feature detection types, removed some duplicate code and merged the feature detection code which relies on selectors
- Replaced the function checksum calculations to make it more apparent what the feature detections do
- Removed the now obsolete (and unused) firstRetOffset function

svn-id: r45995
2009-11-19 23:05:12 +00:00