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
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrew Kurushin 9511b474dc fix resource refactor regression 
svn-id: r46659
 2009-12-27 20:56:10 +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
Vladimir Menshakov 3e915d9ec5 implemented fade in/out effects 
svn-id: r46653
 2009-12-27 18:21:49 +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
Vladimir Menshakov 3936861b7c allowed list to be sorted with default comparator 
svn-id: r46644
 2009-12-27 14:13:39 +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
Johannes Schickel 69ba1ee04d Some more code format fixes. 
svn-id: r46641
 2009-12-27 13:58:00 +00:00
Vladimir Menshakov cddb95d9c3 more code convention fixes 
svn-id: r46640
 2009-12-27 13:33:12 +00:00
Vladimir Menshakov 17380ba06e added whitespace to conform code convention 
svn-id: r46639
 2009-12-27 13:25:07 +00:00
Vladimir Menshakov 668ecc5d38 replaced bubble sort with quick sort 
added distance(a, b) functions

svn-id: r46638
 2009-12-27 13:19:44 +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
Johannes Schickel 3c99391b49 Add some tests for checkSort just in case... :-) 
svn-id: r46622
 2009-12-27 11:12:26 +00:00
Johannes Schickel 11a835b6ce Typo. 
svn-id: r46621
 2009-12-27 11:12:05 +00:00
Johannes Schickel cbeb001189 Do not use TS_ASSERT_EQUALS in checkSort, but rather let return checkSort an 
boolean, which indicates whether the sequence is sorted by the given predicate.
This allows for easier checking which order related tests failed.

svn-id: r46620
 2009-12-27 11:06:05 +00:00
Johannes Schickel 1cd917f674 More cleanup. 
svn-id: r46619
 2009-12-27 11:05:43 +00:00
Johannes Schickel 7f8beedda7 Use some pseudo random numbers in test_container_sort. 
svn-id: r46618
 2009-12-27 11:05:22 +00:00
Johannes Schickel 835c6c0d63 Cleanup. 
svn-id: r46617
 2009-12-27 10:47:34 +00:00
Vladimir Menshakov 18d4bbdccc fixed typo 
svn-id: r46616
 2009-12-27 10:05:37 +00:00
Vladimir Menshakov 60b3365686 added tests for sort() functions 
svn-id: r46615
 2009-12-27 09:54:11 +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
Florian Kagerer 2a0b03218c LOL: - added workaround for portrait speech animations which would sometimes "freeze" 
- renamed some stuff

svn-id: r46601
 2009-12-26 19:02:16 +00:00
Martin Kiewitz 78d268b21a SCI/newgui: Added support for draw_pic command 
svn-id: r46599
 2009-12-26 18:07:36 +00:00
Oystein Eftevaag 4950d0de78 Look for Makefile.common instead of Makefile, when determining whether or not we need to generate a Makefile for building outside the source tree. This to make sure any changes will actually take effect 
svn-id: r46598
 2009-12-26 17:46:22 +00:00