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

83 commits

Author SHA1 Message Date
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
Walter van Niftrik
260a2019b6 SCI: Add autodetection for DoSound. Cleanup. 
svn-id: r43482
 2009-08-17 15:49:22 +00:00
Walter van Niftrik
2ac6e260b6 SCI: Fix whitespace. 
svn-id: r43451
 2009-08-16 19:20:09 +00:00
Walter van Niftrik
00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect 
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
 2009-08-16 19:18:19 +00:00
Walter van Niftrik
5709e524f9 SCI: Rename sci_version_t to SciVersion 
svn-id: r43407
 2009-08-15 12:09:47 +00:00
Walter van Niftrik
f99932b72a SCI: Added enum for map and volume versions. Removed res_version setting from 
detection.cpp (should be detectable). Cleanup.

svn-id: r43390
 2009-08-15 00:28:59 +00:00
Max Horn
50cd2750cc SCI: Avoid using perror (it's not portable) 
svn-id: r42866
 2009-07-28 22:28:40 +00:00
Filippos Karapetis
f0892cdcbe Some work on QFG1VGA (looks like a mix of SCI1 and SCI1.1) 
svn-id: r42393
 2009-07-11 19:00:56 +00:00
Filippos Karapetis
848b9cda03 If we fail to auto-detect either the volume or the map version, set the one to be equal to the other 
svn-id: r42386
 2009-07-11 16:07:14 +00:00
Filippos Karapetis
28dd343e08 Applied slightly modified patch 2819002 - "SCI: resource-view-patch on SQ5/German fix" 
svn-id: r42374
 2009-07-11 06:43:01 +00:00
Johannes Schickel
e8e9b88227 Oops specify the correct revsision number in the fixme. 
svn-id: r42306
 2009-07-09 16:24:59 +00:00
Johannes Schickel
5d0d67e574 Add fixme about SCI32 specific code. 
svn-id: r42305
 2009-07-09 16:23:22 +00:00
Johannes Schickel
1ac515c629 By comparing the commit log of r42300, it seems that "off" was renamed to "lastDirectoryOffset". I changed the SCI32 specific code to use that now. I can't assure this is anyhow correct, so anyone with knowledge of this code please check it. 
svn-id: r42303
 2009-07-09 16:16:08 +00:00
Johannes Schickel
0aa83f14c7 Fix wrong format arugment. 
svn-id: r42301
 2009-07-09 15:59:20 +00:00
Filippos Karapetis
717de7800c Applied patch #2818845 - "SCI: resource.map detection for SCI1/1.1 fixed", with some slight formatting changes 
svn-id: r42300
 2009-07-09 15:54:18 +00:00
Filippos Karapetis
ab8c3d56b8 Removed the weird checks for a maximum resource number (the sci_max_resource_nr array), as it doesn't serve any real purpose and leads to strange errors: if a resource is found which is bigger than the maximum number, it will be remapped to an incorrect number from this check. This makes KQ5CD work properly again (resources would be remapped to incorrect resource numbers from this code as a result of not updating this array with the latest SCI version merges). 
svn-id: r42219
 2009-07-07 13:39:24 +00:00
Filippos Karapetis
74670cc834 Removed the superfluous sci_version_types array (it's essentially the same as the versionNames array) 
svn-id: r42216
 2009-07-07 12:29:55 +00:00
Filippos Karapetis
a9aaf56b3e Cleanup: added an enum for the auto-detected features, removed the selectors which are only used for auto-detection from the convenience selector map and placed feature auto-detection in a separate function. Also, now the automatically detected graphics resources are shown in the console. 
svn-id: r42212
 2009-07-07 11:14:18 +00:00
Filippos Karapetis
c716e43a2b - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01 
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit

svn-id: r42206
 2009-07-07 07:44:25 +00:00