Commit Graph

124 Commits

Author SHA1 Message Date
Filippos Karapetis
0f0e123e5a Turned the asserts about the unknown sound field into a warning
svn-id: r47600
2010-01-27 15:06:47 +00:00
Matthew Hoops
eabbe89971 Improve support for the SCI2.1/SCI3 file naming scheme. Multiple maps can be used and have to be matched up with their volume counterparts. Adding detection for the Phantasmagoria Demo too.
svn-id: r47588
2010-01-27 04:26:28 +00:00
Walter van Niftrik
9861b04b93 SCI: Add driver for Yamaha FB-01. Cleanup.
svn-id: r47571
2010-01-26 19:25:33 +00:00
Martin Kiewitz
36c2243c48 SCI: also test for mapVersion == sci32 for setting viewtype to kViewVga11 - fixes kq7
svn-id: r47568
2010-01-26 15:22:04 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Filippos Karapetis
df149e1509 Separated the parser code
svn-id: r47480
2010-01-23 17:55:54 +00:00
Martin Kiewitz
8ff407e80a SCI: added comment about resource.p01 etc. (including possible TODO)
svn-id: r47364
2010-01-18 23:07:56 +00:00
Martin Kiewitz
3a34628e9e SCI: added comment for merging together resource.p* files, if no volume file could get opened
svn-id: r47363
2010-01-18 23:01:05 +00:00
Martin Kiewitz
7c646fb84b SCI: added warning() when detection fails to detect map and volume version
svn-id: r47349
2010-01-17 22:41:29 +00:00
Martin Kiewitz
055e17b60e SCI: fixed detection to not crash when adding sierras pinball creep, also changed detection so that we dont "accept" games that use unknown view resources (otherwise pinball creep will get detected as SCI)
svn-id: r47348
2010-01-17 22:32:53 +00:00
Walter van Niftrik
bea8d931ff SCI: Add comment to channel mask code
svn-id: r47337
2010-01-17 04:57:21 +00:00
Walter van Niftrik
c7b258f87e SCI: Cleanup
svn-id: r47335
2010-01-17 02:13:40 +00:00
Walter van Niftrik
6caf8e3f89 SCI: Fix rhythm channel handling in SCI0
svn-id: r47326
2010-01-16 19:11:37 +00:00
Filippos Karapetis
22e8b3ed02 The GM patches from Sierra's GM utility can now also be processed with their original names. Thus, the user can just extract the patches from Sierra's GM utility in the extras folder, and it's not necessary to rename each individual file to "4.pat" and place it inside the associated game (works with the games that Sierra's GM patch updates, i.e. LSL1, LSL5, Hoyle3, SQ1, SQ4, Eco1, Longbow and Fairy tales)
svn-id: r47318
2010-01-16 00:22:22 +00:00
Max Horn
8559f0c3eb SCI: Use prefix increment instead of postfix on iterators (more efficient); also correct code formatting issues
svn-id: r47295
2010-01-13 23:58:25 +00:00
Max Horn
a88b2639f5 SCI: empty() checks whether the map is empty... removing useless line of code :)
svn-id: r47294
2010-01-13 23:57:53 +00:00
Johannes Schickel
0d995c5920 Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc.
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)

This commit does not touch "adlib" and "ADLIB" uses!

Also it does not update all the SCUMM detection entries, which still use "Adlib".

svn-id: r47279
2010-01-12 21:07:56 +00:00
Martin Kiewitz
c371c39568 SCI: changed SoundResource constructor to set values for digitalChannelNr/digitalSampleRate and digitalSampleSize at any time
svn-id: r47220
2010-01-10 11:01:36 +00:00
Walter van Niftrik
6f78bc40dd SCI: Move music device IDs to drivers.
svn-id: r47190
2010-01-09 02:14:12 +00:00
Walter van Niftrik
3dda1c8073 SCI: Fix view detection in Hoyle 2
svn-id: r47154
2010-01-08 13:45:44 +00:00
Martin Kiewitz
72ecf8b61e SCI: add robot/.rbt files to resourcemanager class
svn-id: r47096
2010-01-06 20:54:18 +00:00
Martin Kiewitz
f245917d6f SCI/newmusic: fadeout in sci0 (not stopping music yet), revert of SoundResource changes
svn-id: r46972
2010-01-04 15:17:46 +00:00
Martin Kiewitz
01ebbcf101 SCI: channels[] work, sci0 fading still not working (volume is changed though)
svn-id: r46969
2010-01-04 13:21:35 +00:00
Filippos Karapetis
c0aad0508c Renamed SCI_VERSION_AUTODETECT to SCI_VERSION_NONE to signify its actual purpose
svn-id: r46959
2010-01-03 22:50:39 +00:00
Matthew Hoops
7d5e91337e Fix the GK1 view segfault. szUnpacked was overflowing in SCI32 -- it should be uint32. GK1 now is a bit more playable, with many many glitches.
svn-id: r46917
2010-01-03 04:46:00 +00:00
Matthew Hoops
6ba2bd8bfc Add support for wave files in the audio volume. This is used in Pharkas CD and GK1 CD.
svn-id: r46916
2010-01-03 03:37:50 +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
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
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
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
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
6536432b30 Changed some comments
svn-id: r46624
2009-12-27 11:56:51 +00:00
Filippos Karapetis
e939054637 Silenced a chatty console debug message
svn-id: r46612
2009-12-27 02:55:39 +00:00
Martin Kiewitz
46eb68090c SCI/newmusic: Added comments about sound resource headers
svn-id: r46567
2009-12-25 22:58:45 +00:00
Matthew Hoops
ff00963a8b Silence a bunch of gcc warnings (and Merry Christmas, if you celebrate).
svn-id: r46565
2009-12-25 21:54:31 +00:00
Martin Kiewitz
9255d43a16 SCI/newmusic: Change to channel filtering for sci0early to reflect actual sierra driver behaviour
svn-id: r46564
2009-12-25 21:51:02 +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
Martin Kiewitz
c2f17f9bb9 SCI/newmusic: support for early sound resource format, early kq4 version now gets music, is not filtered yet
svn-id: r46561
2009-12-25 18:25:15 +00:00
Filippos Karapetis
113c0941ae - Introduced a new version in the sound version detection routine, as SCI0 early games had different sound than SCI0 late ones
- Changed sound-related debug output from printf's into debugC calls

svn-id: r46560
2009-12-25 18:15:16 +00:00
Martin Kiewitz
f5d8bb1d5e SCI: new music code / dont filter channel 15 (control) at any time
svn-id: r46526
2009-12-24 13:20:23 +00:00
Martin Kiewitz
8e3d34c8a0 SCI: channels are now filtered for sci0 (fixes garbled music)
svn-id: r46525
2009-12-24 11:42:37 +00:00
Max Horn
a526e35d3d SCI: Fix warning
svn-id: r46509
2009-12-23 17:07:01 +00:00
Martin Kiewitz
096b46f1d5 SCI: new music code / wip support for sci0 music
svn-id: r46507
2009-12-23 16:51:41 +00:00
Martin Kiewitz
fd861aaac4 SCI: new music code / variable-names changed to make it more verbose
svn-id: r46502
2009-12-23 16:17:42 +00:00
Martin Kiewitz
162b697220 SCI: sound resource added data format comments
svn-id: r46495
2009-12-23 12:49:38 +00:00
Martin Kiewitz
957737d018 SCI: sound resource handling fixed (fixes lsl5 music w/ new music code)
svn-id: r46494
2009-12-23 12:39:24 +00:00
Filippos Karapetis
c1e90ce3cc Implemented cmdUpdateCues() in the new sound code and fixed a crash when loading music with a resource number of zero
svn-id: r46435
2009-12-20 16:35:37 +00:00
Filippos Karapetis
fa859f6ab1 Directly modify the sound objects, instead of modifying a local copy. Remove duplicate code (which now resides in resource.*)
svn-id: r46427
2009-12-20 13:13:07 +00:00