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
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
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
8b4dabea83
Fixed game restarting regression
...
svn-id: r46026
2009-11-20 21:50:17 +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
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
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
Filippos Karapetis
b6c46c752c
Moved getAngle() inside kmovement.cpp, the only place where it's actually used
...
svn-id: r45903
2009-11-14 17:53:30 +00:00
Filippos Karapetis
7c73bc2965
Cleaned up the file handling functions and removed the C IO wrappers. Apparently, the special case that these were meant to handle never occurs (i.e. reading and writing to the same file), and the current code works well enough to justify these extra sanity checks
...
svn-id: r45902
2009-11-14 16:19:25 +00:00
Filippos Karapetis
e2985a4173
Removed sfx/misc.h
...
svn-id: r45885
2009-11-14 03:15:20 +00:00
Filippos Karapetis
fbfafb576e
Started objectifying kDoSound()
...
svn-id: r45862
2009-11-12 15:24:11 +00:00
Filippos Karapetis
c45c335e0d
Some more tweaks for skipping the menu data in savegames, when INCLUDE_OLDGFX isn't defined (it still problematic and goes out of sync)
...
svn-id: r45858
2009-11-12 11:47:28 +00:00
Filippos Karapetis
226f0bd23d
The menu bar code is no longer used in the new graphics code, and the menu state is no longer stored in saved games
...
svn-id: r45854
2009-11-12 09:24:46 +00:00
Martin Kiewitz
1bc60e9d85
SCI/newgui: call menuReset() on game_init(), fixes double menu in pq2
...
svn-id: r45843
2009-11-11 21:22:04 +00:00
Max Horn
53d0bcd594
SCI: Remove remarks about in-place loading, at least for now.
...
Not loading in-place has the advantage that it allows to cleanly
cancel loading a savesate, e.g. if we detect a defect during
loading. This is much harder (if not impossible) to achieve if
loading in-place. So I'd prefer if we took advantage of this.
Right now, though, we don't.
svn-id: r45786
2009-11-09 22:20:59 +00:00
Martin Kiewitz
b64afbdac0
SCI/newgui: kDisposeWindow - changed to reflect actual sierra sci behaviour
...
svn-id: r45683
2009-11-05 07:27:36 +00:00
Filippos Karapetis
1f49679db5
Moved the audio related command enums inside audio.h
...
svn-id: r45676
2009-11-05 00:04:53 +00:00
Matthew Hoops
d2b76368e1
Fix CD Audio in JonesCD and add some comments.
...
svn-id: r45669
2009-11-04 15:41:40 +00:00
Filippos Karapetis
5daca46946
Removed unused variables and placed some more old code inside INCLUDE_OLDGFX defines
...
svn-id: r45668
2009-11-04 15:32:25 +00:00
Filippos Karapetis
c8fbac1517
- Changed the segment manager to be a static part of the engine, and stopped deleting and recreating it when restoring games
...
- Merged game_exit(), script_free_vm_memory() and script_free_engine()
- Cleanup
svn-id: r45666
2009-11-04 14:22:17 +00:00
Filippos Karapetis
f83d7c6339
Reapplied the LSL1 casino workaround, which got disabled accidentally in commit #45661
...
svn-id: r45665
2009-11-04 14:17:14 +00:00
Martin Kiewitz
429c06c5ae
SCI/newgui: kGraph / InitPriority changed to reflect sci0 implementation, also moved code
...
svn-id: r45661
2009-11-04 12:54:27 +00:00
Filippos Karapetis
12e3375f3b
Removed the reference to SciGuiCursor from EngineState
...
svn-id: r45660
2009-11-04 12:19:05 +00:00
Filippos Karapetis
effdfcd4b8
Added references to the scaleX and scaleY selectors, used for SCI1.1 view scaling
...
svn-id: r45659
2009-11-04 12:16:08 +00:00
Filippos Karapetis
f755311114
priority_first and priority_last are not used by the new drawing code, thus the new code didn't handle priority changes by kGraph()
...
svn-id: r45658
2009-11-04 11:52:11 +00:00
Filippos Karapetis
7d00c4a7f1
Moved the audio CD handling code inside the AudioPlayer class. Some cleanup
...
svn-id: r45656
2009-11-04 11:22:46 +00:00
Filippos Karapetis
2dbf6662fc
Moved the sound sync code inside the AudioPlayer class
...
svn-id: r45655
2009-11-04 10:20:25 +00:00
Filippos Karapetis
611f5dd95f
Moved sound sync related variables inside the AudioPlayer class and fixed compilation
...
svn-id: r45654
2009-11-04 09:49:28 +00:00
Filippos Karapetis
597524b255
Moved most of the code for playing sound effects and speech into a separate class
...
svn-id: r45653
2009-11-04 09:36:18 +00:00
Filippos Karapetis
66d3540f2c
Cleanup
...
svn-id: r45652
2009-11-04 09:31:35 +00:00
Martin Kiewitz
d758538eaa
SCI/newgui: SciGuiMenu partially implemented
...
svn-id: r45634
2009-11-03 19:33:31 +00:00
Filippos Karapetis
34aaac37fc
Removed some more hacks for accessing the segment manager
...
svn-id: r45631
2009-11-03 14:24:47 +00:00
Walter van Niftrik
7f8a8732a1
SCI: Fix hoyle hack
...
svn-id: r45619
2009-11-02 23:06:30 +00:00