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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
7940 Commits
Author SHA1 Message Date
Filippos Karapetis 2bc0ffdeb7 SCI/new music code: hopefully fixed a race condition 
svn-id: r46882
 2010-01-02 13:57:36 +00:00
Filippos Karapetis 5b4b8e053f SCI/new music code: Fix for a music related crash in SCI0 games (the sound object can get deleted while polling it) 
svn-id: r46881
 2010-01-02 13:36:12 +00:00
Filippos Karapetis d4dda4df83 SCI/new music code: Implemented cmdSetSoundHold. Larry now exits the limo normally in LSL5 
svn-id: r46880
 2010-01-02 13:04:36 +00:00
Martin Kiewitz 0c9b828db1 SCI: console behaviour changed for vmvars command, now allows entering decimal values, also accepts hexadecimal values (use e.g. 12h). hexadecimal addresses are still accepted as well 
svn-id: r46878
 2010-01-02 09:39:17 +00:00
Martin Kiewitz df94844db0 SCI/newmusic: now clipping volume in cmdFadeSound 
svn-id: r46876
 2010-01-02 08:30:19 +00:00
Martin Kiewitz 513a56cd5e SCI/newmusic: set default volume on MusicEntry creation, use volume selector sci1late (soundversion) only 
svn-id: r46875
 2010-01-02 08:15:01 +00:00
Matthew Hoops 1f2c92076b Fix the GK1 CD intro sequence (regression from r46839, which fixed a regression from r46656). kPlatform with no arguments is different in SCI32. 
svn-id: r46874
 2010-01-02 03:44:40 +00:00
Filippos Karapetis caf75e1bf5 SCI/new music code: Implemented cmdSetSoundPriority 
svn-id: r46873
 2010-01-02 01:41:39 +00:00
Filippos Karapetis a927cff256 SCI/new sound code: disabled some unused code and named a previously unknown variable of the sound channel data 
svn-id: r46872
 2010-01-02 01:40:10 +00:00
Filippos Karapetis 94fb4762e2 Changed wording from "handle" to "sound", as we're dealing with sound objects, not handles. Also, made the warnings thrown when a slot couldn't be found more verbose. Finally, changed the logic of when warnings should be thrown in cmdSetSoundLoop 
svn-id: r46871
 2010-01-02 01:09:49 +00:00
Filippos Karapetis 032b23e8d8 SCI/new music code: Fixed some mutex-related issues 
svn-id: r46869
 2010-01-02 00:45:55 +00:00
Walter van Niftrik 8407b4d723 SCI: Adlib: Fix bug in master volume handling. 
svn-id: r46865
 2010-01-01 23:48:55 +00:00
Walter van Niftrik 205f7437ea SCI: Fix segfault in dual-language KQ5. 
svn-id: r46864
 2010-01-01 23:48:22 +00:00
Martin Kiewitz 03376d06f1 SCI/newmusic: removed TODO 
svn-id: r46858
 2010-01-01 22:17:59 +00:00
Martin Kiewitz 0a965ced69 SCI/newmusic: changed setting volume from fade logic, implemented updating loop selector for sound fx 
svn-id: r46856
 2010-01-01 22:15:52 +00:00
Martin Kiewitz d6d4a4f6e0 SCI: fix build 
svn-id: r46854
 2010-01-01 21:55:51 +00:00
Martin Kiewitz 37d56920ef SCI/newmusic: changed fade volume setting for digital fx to onTimer() again, because setting it in updateCues() wont work right. We are processing fading effectively in there any way, added TODO for working approach 
svn-id: r46853
 2010-01-01 21:44:50 +00:00
Martin Kiewitz 44dc3f9bfb SCI: kDoAudio now also clips volume and adjusts to mixer volume 
svn-id: r46852
 2010-01-01 21:26:46 +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
Martin Kiewitz 2a9e835695 SCI: Added TODO within kDoAudio 
svn-id: r46847
 2010-01-01 20:26:18 +00:00
Martin Kiewitz 7b0c1f262f SCI: fixing bad sorting of saved games due MMDDYYYY date saving 
svn-id: r46846
 2010-01-01 19:52:50 +00:00
Filippos Karapetis 98194bfe13 SCI/new music code: The MIDI driver is now reset whenever the game's VM respawns, like what the old music code does. Fixes the MIDI music in KQ5CD, Lonbgow and perhaps others 
svn-id: r46843
 2010-01-01 19:23:23 +00:00
Martin Kiewitz 74159e12eb SCI/newmusic: set speech soundtype for audio resources played by kDoSound, cmdVolume is supposed to set music and sfx volume only - this whole fixes volume issues in lb2cd and others 
svn-id: r46842
 2010-01-01 18:57:14 +00:00
Martin Kiewitz 64d484bd99 SCI/newmusic: adding debug output to setVolume 
svn-id: r46841
 2010-01-01 17:53:37 +00:00
Filippos Karapetis 78b2692193 SCI/new music code: Center pitch wheel when unloading music tracks 
svn-id: r46840
 2010-01-01 17:25:44 +00:00
Filippos Karapetis 763c59bd46 Fixed KQ5CD (regression from rev. 46656) 
svn-id: r46839
 2010-01-01 17:16:12 +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 d1b844d3c3 SCI: syncing loop selector... again... fixes qfg1 ending... again... now sci0 only 
svn-id: r46835
 2010-01-01 16:15:20 +00:00
Filippos Karapetis 153cf54850 SCI/new music code: Moved processing of digital sound effects outside the MIDI worker thread. Some cleanup 
svn-id: r46834
 2010-01-01 16:05:26 +00:00
Filippos Karapetis 74ae4ecc48 Added a comment for the reason updateSci0Cues() is called within kAnimate() 
svn-id: r46833
 2010-01-01 15:35:27 +00:00
Martin Kiewitz 7bb18a018a SCI/newmusic: doing version check before looking for audio resource 
svn-id: r46831
 2010-01-01 14:41:11 +00:00
Martin Kiewitz 810478e07f SCI/newmusic: better solution for volume - using int16 during fade, volume is now byte again 
svn-id: r46829
 2010-01-01 14:33:20 +00:00
Martin Kiewitz 25e111bcac SCI: changing volume to int16 again, fixes fadeOut of music and samples 
svn-id: r46828
 2010-01-01 14:23:16 +00:00
Martin Kiewitz 385c462352 SCI: fixing saved game compatibility 
svn-id: r46827
 2010-01-01 14:22:07 +00:00
Martin Kiewitz 7cf1d5bd5d SCI/newmusic: added fade and loop capability to samples (looping doesnt work yet), fixes lsl1 doll inflation endless loop 
svn-id: r46820
 2010-01-01 13:21:30 +00:00
Martin Kiewitz b1b6555cb5 SCI: implement kFOpen (OPEN_OR_CREATE), makes it possible to save character data at the end of qfg1ega 
svn-id: r46814
 2010-01-01 10:08:14 +00:00
Martin Kiewitz ca83c13ec9 SCI: switch to previous gameid, when importing character data in qfg series 
svn-id: r46813
 2010-01-01 09:40:28 +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
Martin Kiewitz ac7c92c67f SCI: kFileIO findFirst/findNext returns only game-specific prefixed files 
svn-id: r46811
 2009-12-31 23:59:28 +00:00
Yotam Barnoy 080d6da6e4 Minor additions: added full keypad support to GUI and SCI 
svn-id: r46808
 2009-12-31 23:52:49 +00:00
Martin Kiewitz 3ce017cc2d SCI: fixed typo in unwrapFilename 
svn-id: r46807
 2009-12-31 23:43:10 +00:00
Martin Kiewitz e56dedec3f SCI: keyboard change cleanup, fixed Ctrl and Alt related keys on foreign keyboards as well 
svn-id: r46803
 2009-12-31 17:43:54 +00:00
Martin Kiewitz ba8b15908c SCI: keyboard events now dont use scancode anymore, fixing compatibility with foreign keyboard layouts (needs testing, cleanup will follow shortly after) 
svn-id: r46801
 2009-12-31 16:50:26 +00:00
Filippos Karapetis cb6b1e8aff Changed kValidPath() to always return true, regardless of the value of savePath (so that it works with both SCI11 and SCI32 games) 
svn-id: r46800
 2009-12-31 14:59:30 +00:00
Martin Kiewitz 3b1d4ace40 SCI/new music: trigger signal when fade is completed, fixes lsl1 dance with girl 
svn-id: r46798
 2009-12-31 12:38:17 +00:00
Filippos Karapetis c7ea1a1613 Mention the fact that we derive from SSCI by not caching the loop selector 
svn-id: r46797
 2009-12-31 11:14:13 +00:00
Filippos Karapetis 43f349f487 SCI/new music code: removed some hacks 
svn-id: r46793
 2009-12-31 08:55:13 +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
Filippos Karapetis 762bdc7cad SCI/new music code: Slight cleanup 
svn-id: r46791
 2009-12-31 08:10:51 +00:00