thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
78198 commits 35 branches 0 tags 1.4 GiB
Commit graph

351 commits

Author SHA1 Message Date
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
Filippos Karapetis
0c1b646c7f - Started wrapping the current sound code around appropriate defines 
- Introduced a new resource type, SoundResource, used in the new music code

svn-id: r46421
 2009-12-19 16:19:53 +00:00
Max Horn
f692015301 Got rid of ReadStream::ioFailed() 
svn-id: r46379
 2009-12-15 08:18:57 +00:00
Max Horn
5f178e8650 Fix some MSVC warnings (part of patch #2909981) 
svn-id: r46291
 2009-12-08 20:44:57 +00:00
Filippos Karapetis
7e0f8a9af9 Added proper detection and handling of transitive SCI1-SCI1.1 games, like PQ1 VGA. These used SCI1 resources and compression with a SCI1.1 kernel (thanks to waltervn's observations) 
svn-id: r45420
 2009-10-26 21:41:41 +00:00
Filippos Karapetis
e4c23834dd Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places 
svn-id: r45176
 2009-10-16 23:29:00 +00:00
Filippos Karapetis
8ae4206373 Introduced a new debug level, kDebugLevelResMan, and reduced some of the messages printed to the console 
svn-id: r44858
 2009-10-10 00:07:19 +00:00
Filippos Karapetis
633463b1dd Updated comment to indicate that QFG1VGA is one of the newer SCI1.1 games that has word-aligned resources 
svn-id: r44775
 2009-10-08 08:22:19 +00:00
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things) 
svn-id: r44495
 2009-09-30 16:16:53 +00:00
Max Horn
ba0bd938e4 SCI: Rename _sciVersion to s_sciVersion and made it local to resource.cpp (i.e. follow CFG and achieve code/data isolation) 
svn-id: r44271
 2009-09-23 12:12:37 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable 
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
 2009-09-23 10:55:35 +00:00
Filippos Karapetis
1bbab8f191 Some renaming: 
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
 2009-09-02 12:02:37 +00:00
Walter van Niftrik
cc6e21635e SCI: Fix detection of QFG1 remake. 
svn-id: r43832
 2009-08-30 19:33:34 +00:00
Walter van Niftrik
fff023794f SCI: Cleanup 
svn-id: r43811
 2009-08-30 01:37:27 +00:00
Filippos Karapetis
f128f49ea6 If a resource map entry can't be read, retry with the volume version instead, if it's different than the map version 
svn-id: r43755
 2009-08-26 09:38:51 +00:00
Filippos Karapetis
f7acc7f669 Fixed compilation when ENABLE_SCI32 is not set 
svn-id: r43744
 2009-08-25 23:15:18 +00:00
Matthew Hoops
b5da8a5cdc - Split SCI_VERSION_32 into SCI_VERSION_2, SCI_VERSION_2_1, and SCI_VERSION_3 (each version has a different kernel table). 
- Improve map detection.
- Fix SCI32 object and script initialization (Torin's Passage and GK1 scripts now start up, and probably most SCI2/2.1 games).
- Add SCI2 and SCI2.1 kernel tables.

svn-id: r43742
 2009-08-25 23:02:57 +00:00
Filippos Karapetis
ed66cad677 - Simplified the parameters of some functions 
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
 2009-08-25 08:38:14 +00:00
Matthew Hoops
6b21f1c932 Fix detection of some later SCI32 games (RESMAP.001) and some cleanup. 
svn-id: r43608
 2009-08-21 19:48:48 +00:00
Matthew Hoops
c0d9543345 Fix detection of SCI32 resource maps and volumes 
svn-id: r43603
 2009-08-21 18:12:13 +00:00
Joost Peters
8f587ed5e4 remove \n's from warning() calls 
svn-id: r43567
 2009-08-20 19:49:52 +00:00
Walter van Niftrik
8bd4cee2d2 SCI: Add autodetection of Amiga views. 
svn-id: r43547
 2009-08-19 21:08:17 +00:00
Filippos Karapetis
db0cd620f6 Started rewriting the SCI engine to use FSNode instead of file names. This is the proper solution for removing the hack in the fallback detector, but it still needs work. Also, reduced the things needed to be initialized a bit, so that the detection is a bit faster 
svn-id: r43510
 2009-08-18 14:10:31 +00:00
Filippos Karapetis
65ac355efa Removed the maxMemory parameter of the resource manager and replaced it with a define 
svn-id: r43503
 2009-08-18 09:12:41 +00:00