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 6c8ee76f80 SCI/new music code: Fixed music fading in SCI2 - seems like setting the signal when fading is done isn't necessary 
svn-id: r46666
 2009-12-28 00:15:31 +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
Matthew Hoops fedd4f1076 Fix regression in SCI1/1.1 wave sound from r46660. I knew it was a bad omen to have that revision number :P 
svn-id: r46664
 2009-12-27 23:35:22 +00:00
Martin Kiewitz 538806af19 SCI/newmusic: fixed warning 
svn-id: r46663
 2009-12-27 22:55:37 +00:00
Matthew Hoops 86306e1e4d wCompressed is still a uint16 in SCI32, so correct the vol version detection. 
svn-id: r46661
 2009-12-27 22:41:33 +00:00
Matthew Hoops 420ab43066 Add support for external wave files used as audio resources in the ResourceManager. The GK1 CD main menu music now works. 
svn-id: r46660
 2009-12-27 22:34:12 +00:00
Martin Kiewitz 4f78c872d7 SCI/newmusic: Accept WAVE files as audio resources (needed for gk1 title music) - requires additional resourcemanager support (or rename sfx\5.wav to 5.aud and add 8Dh 00h header) 
svn-id: r46658
 2009-12-27 20:38:14 +00:00
Matthew Hoops 264bec306a Implement kPlatform subfunctions 0 and 2, and stub 1 and 3 (CD speed and CD check). This fixes the DOS version of GK1 CD to play the SEQ's instead of the AVI's. 
svn-id: r46656
 2009-12-27 19:16:06 +00:00
Martin Kiewitz 3b30b1dcfa SCI/newmusic: fix getting of mastervolume. cause of rounding we will otherwise decrease mastervolume by 1 on every access resulting in no sound after a while :) (fixes lb2, sq4cd and others) 
svn-id: r46654
 2009-12-27 18:24:48 +00:00
Filippos Karapetis 95f90be7ef Fixed priority bug 
svn-id: r46652
 2009-12-27 16:44:38 +00:00
Martin Kiewitz e371c4a1bd SCI/newmusic: Fixed fading (fixes intro of castle of brain) 
svn-id: r46651
 2009-12-27 15:41:31 +00:00
Filippos Karapetis ac224a7f8a Removed _hasNodePtr 
svn-id: r46650
 2009-12-27 15:24:33 +00:00
Filippos Karapetis 4cbac8a2bb Added some currently disabled code to be used when sound fading is done (needs testing) 
svn-id: r46649
 2009-12-27 15:23:56 +00:00
Filippos Karapetis fbf1bada24 cmdGetPolyphony always returns true in SCI0, according to specs 
svn-id: r46647
 2009-12-27 14:25:25 +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
Martin Kiewitz f01a6c9adf SCI/newmusic: moving commented assert 
svn-id: r46632
 2009-12-27 12:38:19 +00:00
Martin Kiewitz fb237cd7ae SCI/newmusic: now playing sample data for sci0 games (this also fixes sq3 amiga freezing during pot exit) 
svn-id: r46631
 2009-12-27 12:33:47 +00:00
Filippos Karapetis 6af32b5b3a Really fixed compilation 
svn-id: r46630
 2009-12-27 12:21:12 +00:00
Martin Kiewitz e6ad7523c8 SCI/newmusic: now adding digital sample data as separate channel for sci0 games (not yet playing) 
svn-id: r46629
 2009-12-27 12:17:43 +00:00
Filippos Karapetis 19cb4ad6e0 Hopefully fixed compilation 
svn-id: r46628
 2009-12-27 12:12:14 +00:00
Filippos Karapetis 6536432b30 Changed some comments 
svn-id: r46624
 2009-12-27 11:56:51 +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 ebb391790f SCI32: Partially implemented kOnMe. Now the main menu in GK1 works 
svn-id: r46614
 2009-12-27 03:57:59 +00:00
Filippos Karapetis 8851663363 Turned some unimplemented debug related kernel functions into dummy functions 
svn-id: r46613
 2009-12-27 02:57:03 +00:00
Filippos Karapetis e939054637 Silenced a chatty console debug message 
svn-id: r46612
 2009-12-27 02:55:39 +00:00
Filippos Karapetis b1c37aee20 SCI/new music code: split the MidiParser class into a separate file 
svn-id: r46611
 2009-12-27 02:46:00 +00:00
Filippos Karapetis 93bdde9317 The state selector is only available in SCI0 games 
svn-id: r46610
 2009-12-27 02:29:58 +00:00
Filippos Karapetis a4990f6f33 Now using m_kiewitz's picture code to show pictures in SCI32. Also took some bits off a similar patch from clone2727. The Sierra logo screen and the menu screen in GK1 should now be shown fully! 
svn-id: r46609
 2009-12-27 01:49:39 +00:00
Martin Kiewitz 6eb5c2f809 SCI/newmusic: added state change to sample play as well 
svn-id: r46607
 2009-12-26 22:26:12 +00:00
Martin Kiewitz 0e513a306d SCI/newmusic: Update state when music is done playing (fixes sq3) 
svn-id: r46606
 2009-12-26 21:47:59 +00:00
Martin Kiewitz 0d20ecc5d4 SCI: Added #ifdefs for sci32 picture format code 
svn-id: r46605
 2009-12-26 21:19:48 +00:00
Martin Kiewitz 0536f58670 SCI: added TODO priority map of sci32 pictures 
svn-id: r46604
 2009-12-26 19:25:32 +00:00
Martin Kiewitz 984cac84cf SCI: support for "no compression" pictures in sci32 
svn-id: r46603
 2009-12-26 19:23:57 +00:00
Martin Kiewitz 20c2d35a92 SCI: support for sci32 picture resource data 
svn-id: r46602
 2009-12-26 19:06:17 +00:00
Martin Kiewitz 78d268b21a SCI/newgui: Added support for draw_pic command 
svn-id: r46599
 2009-12-26 18:07:36 +00:00
Filippos Karapetis f6da0146b2 Throw a warning when we're trying to invoke a variable selector, instead of swallowing it silently. This should never happen, so we shouldn't hide it, when it does 
svn-id: r46596
 2009-12-26 17:10:43 +00:00
Filippos Karapetis 4e743e1a46 SCI2: Figured out the screen coordinates of views. Now, part of the interface can be seen in GK1. Also, silenced the OnMe warnings 
svn-id: r46593
 2009-12-26 16:16:02 +00:00
Filippos Karapetis b2c170168e SCI2: Implemented kListEachElementDo (a more advanced version of SciGuiAnimate:invoke()) and kListAt. Now, the Sierra logo music can be heard, and game logic is running on objects of the animated views list 
svn-id: r46591
 2009-12-26 15:47:57 +00:00
Filippos Karapetis 71f6fede60 Removed the file and line parameters from the selector handling functions 
svn-id: r46588
 2009-12-26 14:58:23 +00:00
Filippos Karapetis 4f02900890 Kernel function 0x26 is empty in SCI1.1 games, and it has been set to kPortrait in KQ6CD only 
svn-id: r46585
 2009-12-26 13:53:59 +00:00
Filippos Karapetis 0de0abb5d3 Case kSciAudioLanguage in kDoAudio always checks for audio capability in SCI1.1 games, regardless of parameters. Fixes a warning in SQ4CD 
svn-id: r46584
 2009-12-26 13:50:52 +00:00
Filippos Karapetis 21c6bbc588 Fixed graphics functions detection in an old version of SQ3 - my initial thought to rely on the presence of the shiftParser selector was wrong 
svn-id: r46580
 2009-12-26 13:35:17 +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 8940a1f537 Restored the mutexes in onTimer, and removed them from soundKill - fixes the freeze in LSL5 intro 
svn-id: r46577
 2009-12-26 10:50:05 +00:00
Martin Kiewitz c78c10b9ee SCI/newmusic: Removed mutex from onTimer, fixes freeze in sci1 games 
svn-id: r46575
 2009-12-26 10:20:57 +00:00
Filippos Karapetis ab2a5429f5 Set the save game directory to something in pre-SCI32 games, as games like SQ4CD complain that it's invalid if it's empty 
svn-id: r46570
 2009-12-26 01:20:12 +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