ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
526 Commits
Author SHA1 Message Date
Filippos Karapetis 2fb37063a4 Placed all the game feature detection code in a separate class 
svn-id: r47850
 2010-02-03 11:02:43 +00:00
Max Horn bec3a0d539 cleanup 
svn-id: r47835
 2010-02-03 01:33:48 +00:00
Max Horn bb5e34a014 SCI: Get rid of EngineState::stack_segment 
svn-id: r47833
 2010-02-03 01:32:59 +00:00
Max Horn 4b19acf255 SCI: Use Common::List and Common::String to simplify breakpoint handling (untested) 
svn-id: r47824
 2010-02-02 22:52:41 +00:00
Martin Kiewitz 845c245ff3 SCI: class menu renamed to GfxMenu - now getting called directly, also fix for loading savedgames 
svn-id: r47792
 2010-02-01 09:53:42 +00:00
Walter van Niftrik a92bb6193b SCI: Implement kMemorySegment(). 
svn-id: r47776
 2010-01-31 19:47:54 +00:00
Martin Kiewitz 7929255cd9 SCI: cleaned up graphics classes, removed gfx&windowmgr, added gfxports, gfxcompare, gfxpaint16, gfxcache. kernel uses gfxports directly w/o going through SciGui 
svn-id: r47745
 2010-01-31 12:35:15 +00:00
Filippos Karapetis 7f4aa161bc Removed duplicate code. Some cleanup 
svn-id: r47735
 2010-01-31 01:26:06 +00:00
Filippos Karapetis 4a4b69dbeb Fixed loading of saved games 
svn-id: r47729
 2010-01-30 23:40:29 +00:00
Matthew Hoops da46fc9b35 Add support for saving/loading Arrays/Strings in SCI32. It's possible to save a game in GK1 now via the console, but not load (yet). 
svn-id: r47696
 2010-01-30 02:03:59 +00:00
Max Horn b124a0c1cd SCI: Reduce header interdependencies a bit 
svn-id: r47666
 2010-01-29 11:05:06 +00:00
Filippos Karapetis 2974ead245 Corrected assert inside load_script. Fixes loading in SQ4CD 
svn-id: r47617
 2010-01-27 23:43:23 +00:00
Filippos Karapetis 722233fd0d - Moved all of the parser-related variables inside the Vocabulary class 
- Moved the kSetSynonyms() function inside kscripts (as it's for script synonyms, not parser word synonyms)
- The parser vocabulary is now only initialized for SCI0 and SCI01 games, which had a parser

svn-id: r47483
 2010-01-23 19:10:56 +00:00
Johannes Schickel edbc368398 Cleanup. (And along with it add some additional asserts). 
svn-id: r47482
 2010-01-23 18:24:11 +00:00
Filippos Karapetis 47c97f4a60 - The reverb value is now obtained from the music driver 
- Implemented kSetReverb (0x50) and kResetOnPause (0x4C)

svn-id: r47433
 2010-01-22 12:26:12 +00:00
Martin Kiewitz cd654b9616 SCI: call gui-init right after loading a saved game, fixes weird gui issue that occurs only when loading a save through ctrl-f5 menu "too early" in the game (where you couldnt load through original interpreter) 
svn-id: r47151
 2010-01-08 11:17:29 +00:00
Filippos Karapetis 84cd8d2dc7 Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose 
svn-id: r47007
 2010-01-05 01:22:16 +00:00
Filippos Karapetis f66d5a7f53 SCI: Removed the old graphics code 
svn-id: r47005
 2010-01-05 00:54:53 +00:00
Martin Kiewitz 379ae6df30 SCI/newmusic: now clips volume against MUSIC_VOLUME_MAX (127) instead of the mixer max volume (which would be wrong of course), adjusts volume when setting sample channel volume 
svn-id: r46850
 2010-01-01 21:04:20 +00:00
Martin Kiewitz 967853c03f SCI: volume for sci0 now set to 127, now using constant instead of value 
svn-id: r46849
 2010-01-01 20:49:56 +00:00
Filippos Karapetis 54d9bf4c57 Fixed broken savegames when saving with the new music code 
svn-id: r46837
 2010-01-01 16:42:35 +00:00
Martin Kiewitz 385c462352 SCI: fixing saved game compatibility 
svn-id: r46827
 2010-01-01 14:22:07 +00:00
Filippos Karapetis afc4bc1295 SCI/new music code: 
- Resolved a deadlock with the mixer, and added appropriate mutexes (a result of the fact that SCI mixes MIDI and digital audio in the same list)
- Fixed sound playing when loading games, by properly resetting the MIDI driver
- Reverted savegame version to 14 - the changes in versions 15 and 16 don't have any effect on the currently enabled old music code, and the new music code is disabled by default, and is still prone to changes
- Now saving/loading signal, loop and hold for each sound, as well as reverb
- Added stub code for setting reverb and channel hold
- The signal, loop and hold values of each song are cached, like in SSCI and like what happens in Greg's SCI implementation. This allows a clear separation of the engine code from the rest of the engine. Reverted commits 46792 and 46797
- Removed duplicate song list accessing code
- Song cues are now updated in kAnimate for SCI0, like the old music code does, to compensate for the fact that SCI0 didn't poll for music changes via cmdUpdateCues, like what SCI01 and newer do
- Cleanup

svn-id: r46812
 2010-01-01 06:41:52 +00:00
Filippos Karapetis 54245f712d SCI/new music code: The loop selector for each music score is no longer cached, but read directly from the sound object 
svn-id: r46792
 2009-12-31 08:30:30 +00:00
Max Horn 81a1d45821 SCI: Start objectifying MusicEntry 
svn-id: r46687
 2009-12-28 21:03:13 +00:00
Filippos Karapetis 5cb5fe22ea SCI/new sound code: 
- Made the SciMusic class private, and added wrapper functions for invoking specific methods of SciMusic from outside the SoundCommandParser class
- Many SCI games keep creating and destroying sound effects constantly (i.e. many times per second). Therefore, another scheme has been devised, which replaces the mutex that was in place. Whenever a sound command is run which operates on a specific object in the play list, we disallow onTimer() from kicking in. This isn't ideal, but it does stop random deadlocks because of locked mutexes without any noticeable side effects

svn-id: r46681
 2009-12-28 20:10:15 +00:00
Filippos Karapetis 5adb6277eb SCI/new music code: 
- Switched to Common::StackLock for mutexes
- Renamed Music::stopAll() -> Music::clearPlayList()
- Implemented a better Music::stopAll method, which stops all sounds with proper signals, instead of destroying them
- Renamed the SCI0 command cmdGetPlayNext -> cmdStopAllSounds and implemented it

svn-id: r46665
 2009-12-27 23:46:11 +00:00
Filippos Karapetis 9f37be314d SCI/new music code: 
- Implemented sound muting
- Now saving/loading the master music volume

svn-id: r46643
 2009-12-27 14:11:26 +00:00
Filippos Karapetis fabe51c129 Renamed gameName -> gameId, to keep the same vocabulary everywhere 
svn-id: r46635
 2009-12-27 12:54:03 +00:00
Filippos Karapetis 6af32b5b3a Really fixed compilation 
svn-id: r46630
 2009-12-27 12:21:12 +00:00
Filippos Karapetis 19cb4ad6e0 Hopefully fixed compilation 
svn-id: r46628
 2009-12-27 12:12:14 +00:00
Filippos Karapetis 0a771e14c1 SCI/new music code: 
- Removed a lot of accessors to the music list, and protected the 2 which are used now with mutexes
- Rewrote the music list save/load code to be methods of the SciMusic class

svn-id: r46623
 2009-12-27 11:43:34 +00:00
Filippos Karapetis d39ac80f4a Hopefully fixed the freezes/deadlocks in the new music code (e.g. in LSL5 and Castle of Dr. Brain) 
svn-id: r46579
 2009-12-26 13:20:07 +00:00
Filippos Karapetis c6a8d0e973 - Made the music playlist private 
- Removed some leaks
- Fixed the destruction of the music playlist
- Made mutexes more sane
- Removed some dead code
- Cleanup

svn-id: r46578
 2009-12-26 11:54:57 +00:00
Filippos Karapetis 12b6d4ab03 Some more work on the new music code 
svn-id: r46569
 2009-12-26 00:50:09 +00:00
Filippos Karapetis a88e4df7a0 SCI/new music code: Fixed a bug where music was stopped when saving. Some cleanup 
svn-id: r46568
 2009-12-26 00:22:21 +00:00
Martin Kiewitz 2f5f625b98 SCI/newmusic: added filter support for kq4early and adlib 
svn-id: r46563
 2009-12-25 18:59:15 +00:00
Filippos Karapetis f5567d4605 Fixed variable capitalization 
svn-id: r46552
 2009-12-25 13:37:55 +00:00
Filippos Karapetis a5bb030b6e Properly initialize the audio stream part of each music slot when loading 
svn-id: r46550
 2009-12-25 13:26:09 +00:00
Filippos Karapetis 809e8c9123 SCI/new music code: Some initial code for saving/loading the sound state 
svn-id: r46549
 2009-12-25 13:18:48 +00:00
Filippos Karapetis 980b8bb899 Moved all of the sound iterator code in its own directory, and added a slight hack to the SoundCommandParser constructor 
svn-id: r46430
 2009-12-20 13:38:13 +00:00
Filippos Karapetis c388e89181 Wrapped some more sound code around appropriate defines 
svn-id: r46429
 2009-12-20 13:28:23 +00:00
Martin Kiewitz 7e1bf3fb4b SCI: Save/LoadGame Common::Rect saving now portable 
svn-id: r46304
 2009-12-09 07:28:04 +00:00
Martin Kiewitz 84b910f755 SCI: new USE_OLDGFX for switching to oldgui, fixes loading of savedgames under oldgui, oldgui doesn't like calling of setPortPic during loading 
svn-id: r46294
 2009-12-08 21:22:22 +00:00
Martin Kiewitz 601fd79733 SCI: SciGui::getPortPic now uses byref 
svn-id: r46293
 2009-12-08 21:04:40 +00:00
Martin Kiewitz a2d7505e81 SCI: Saving picPort now (fixes loading saved games in castle of dr. brain) 
svn-id: r46292
 2009-12-08 20:54:18 +00:00
Martin Kiewitz 4fb779dbaf SCI: Recreate SciEvent on loading saves 
svn-id: r46253
 2009-12-04 17:42:32 +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
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