libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
52,271 Commits 5 Branches 5 Tags 1.8 GiB
3c04d333f2
Commit Graph

322 Commits

Author SHA1 Message Date
Max Horn
24673b9ee9 Fix warning 
svn-id: r49386
 2010-06-02 00:20:52 +00:00
Filippos Karapetis
a6efbf8880 Fixed the detection of SCI2.1 games in the fallback detector 
svn-id: r49382
 2010-06-01 22:06:52 +00:00
Filippos Karapetis
95001e3676 Add support for SCI2.1 resource patches to the fallback detector 
svn-id: r49380
 2010-06-01 20:37:55 +00:00
Filippos Karapetis
016862ac3a Moved setScriptSize() inside Script::init(), and removed a FIXME - the SCI1.1 word-align is done inside Script::init() 
svn-id: r49330
 2010-05-30 18:45:07 +00:00
Filippos Karapetis
0276ec835e Fixed findGameObject() for SCI11 games 
svn-id: r49326
 2010-05-30 15:17:29 +00:00
Filippos Karapetis
3d09af0377 Removed the hack inside findGameObject(), and replaced it with code from the segment manager, till we find out why the segment is sometimes off by 1 (note that findGameObject() works fine for finding the game ID itself) 
svn-id: r49310
 2010-05-29 15:27:27 +00:00
Filippos Karapetis
708b37898c Fixed regression in SCI2-SCI21 games from commit 49308 
svn-id: r49309
 2010-05-29 15:01:33 +00:00
Filippos Karapetis
6f056c6c98 Added a method to the resource manager, to limit the places where script exports are accessed, since for SCI11 and newer exports can be functions and objects (first step in removing scriptRelocateExportsSci11(), which is a gross hack and it fails in QFG1VGA) 
svn-id: r49308
 2010-05-29 14:03:08 +00:00
Filippos Karapetis
5f5dcbad47 Added an explanation for audio36 and sync36 external patches 
svn-id: r49262
 2010-05-27 12:00:20 +00:00
Filippos Karapetis
e5eaf3ee55 Split all of the audio-related functions of the resource manager in a separate file 
svn-id: r49260
 2010-05-27 08:09:32 +00:00
Filippos Karapetis
739f551852 Slight formatting, and added a note that audio36 and sync36 resource patches were introduced in SCI2, and didn't exist in SCI0-SCI1.1 
svn-id: r49259
 2010-05-27 07:50:23 +00:00
Matthew Hoops
99fc5cbfca Add the Mac sync resource type and allow for more than 9 Mac SCI1.1+ data files. 
svn-id: r49255
 2010-05-27 03:15:24 +00:00
Max Horn
7b8837cda7 SCI: Simplify appending string 'seeker' to sierraId 
svn-id: r49244
 2010-05-26 15:41:50 +00:00
Filippos Karapetis
3187149cca Avoid adding a null char in the sierraId Common::String 
svn-id: r49234
 2010-05-26 11:02:50 +00:00
Filippos Karapetis
60dd310688 Cleanup 
svn-id: r49227
 2010-05-26 06:53:08 +00:00
Matthew Hoops
d49fb8f42d Add support for showing the icon bar in SCI1.1 Mac. 
svn-id: r49196
 2010-05-24 17:21:11 +00:00
Filippos Karapetis
c874ff15a8 Cleaned up the game ID code: 
- The game ID is now obtained from ScummVM ID directly, not by converting Sierra's internal ID
- Moved the code which reads the internal Sierra ID inside the resource manager
- Moved the code which converts the internal Sierra ID to ScummVM's IDs together with the rest of the detection code

svn-id: r49152
 2010-05-23 10:28:03 +00:00
Matthew Hoops
3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression. 
svn-id: r49070
 2010-05-18 04:17:58 +00:00
Johannes Schickel
983c41bea2 Remove useless const on a value return type. 
svn-id: r49022
 2010-05-13 13:32:12 +00:00
Matthew Hoops
7344ac20d7 Add support for loading SCI games from Mac resource forks. The games themselves do not work yet as some (not all) of the data is in BE order instead of LE. They currently error out because it thinks the relocation block is outside of the script. 
svn-id: r48998
 2010-05-10 18:29:13 +00:00
Martin Kiewitz
b4d35b3279 SCI: calculate sampleLen for WAVEs as well 
svn-id: r48906
 2010-05-03 13:30:09 +00:00
Martin Kiewitz
561ad56616 SCI: make audio decompression (mp3/ogg/flac) work on BE devices 
svn-id: r48889
 2010-05-02 10:21:02 +00:00
Martin Kiewitz
0cd0d8bafe SCI: fix sync resources not loading correctly when compressed (mp3/ogg/flac) audio resource file was used 
svn-id: r48881
 2010-05-01 14:51:57 +00:00
Martin Kiewitz
e3ac8713e3 SCI: fix bugs in audio decompression (mp3, ogg, flac) 
svn-id: r48880
 2010-05-01 14:04:48 +00:00
Matthew Hoops
3b401eb53c Silence gcc warnings. 
svn-id: r48858
 2010-04-29 19:06:49 +00:00
Martin Kiewitz
6e6b90f41c SCI: remove unneeded #includes from resource.cpp 
svn-id: r48857
 2010-04-29 19:01:06 +00:00
Martin Kiewitz
13ee099090 SCI: audio compression support 
svn-id: r48856
 2010-04-29 15:54:59 +00:00
Martin Kiewitz
666fefc79d SCI: first byte of resource patch must have 0x80 added to the resource type, otherwise sierra sci0+ interpreter won't accept the file, fixing this on debug export function 
svn-id: r48780
 2010-04-24 11:59:19 +00:00
Martin Kiewitz
aaa6e7ee54 SCI: key presses of extended chars (umlauts, etc.) will now get ignored in games that don't support them (which is all non-multilingual games) 
svn-id: r48693
 2010-04-17 20:43:09 +00:00
Max Horn
ee1110a114 SCI: Reduce header interdependencies 
svn-id: r48086
 2010-02-17 23:38:43 +00:00
Max Horn
86e34c3464 SCI: Rename some members of class Resource 
svn-id: r48085
 2010-02-17 23:37:59 +00:00
Max Horn
903b694574 SCI: Cleanup resource.h 
svn-id: r48084
 2010-02-17 23:37:32 +00:00
Max Horn
e17a2bd37d SCI: Change getSciVersionDesc() to return 'const char *' instead of 'Common::String' 
svn-id: r48044
 2010-02-13 11:58:15 +00:00
Martin Kiewitz
da771b91e6 SCI: we checked first cel size when detecting hires instead of actual picture resolution, now checking correctly 
svn-id: r47865
 2010-02-03 21:59:41 +00:00
Walter van Niftrik
f24e0aad2b SCI: When removing audio resources from the resource manager, also remove them from the LRU list. 
svn-id: r47789
 2010-02-01 01:05:08 +00:00
Walter van Niftrik
43c15603c3 SCI: Add support for early audio map files. 
svn-id: r47773
 2010-01-31 19:44:40 +00:00
Filippos Karapetis
a7165c02c1 Removed the hack for kResourceTypeRobot patch files 
svn-id: r47730
 2010-01-31 00:13:16 +00:00
Filippos Karapetis
233f81c5e1 Added support for the hires graphic resources of the Windows version of GK1 
svn-id: r47673
 2010-01-29 16:25:18 +00:00
Filippos Karapetis
b20ccaa8ab Corrected the map number for the GK2 resource patch files, and added some preliminary non-working code for the hires content in GK1 
svn-id: r47658
 2010-01-28 22:26:13 +00:00
Martin Kiewitz
9e511e0751 SCI: detecting hires for SCI2+ games, qfg4cd is sci2.1 but still 320x200 
svn-id: r47651
 2010-01-28 21:01:57 +00:00
Martin Kiewitz
8ecd76e415 SCI: process robot files again (i need those for REing) 
svn-id: r47644
 2010-01-28 16:30:46 +00:00
Filippos Karapetis
0b987fe066 Added support for the SCI2.1 resource patches (resmap.pat and ressci.pat). GK2 goes a bit further now (but still dies because of a new script opcode) 
svn-id: r47641
 2010-01-28 11:19:27 +00:00
Martin Kiewitz
34346bfd33 SCI: fix view detection for sci1.1 pq4demo 
svn-id: r47614
 2010-01-27 22:55:30 +00:00
Matthew Hoops
898135b7d0 SearchMan.listMatchingMembers does not return files in alphabetical order, so we can't rely on the order of the lists. Rework the SCI2.1+ loading code to iterate through both lists in nested loops to fix multi-archive SCI2.1 games (such as GK2). 
svn-id: r47612
 2010-01-27 21:43:23 +00:00
Filippos Karapetis
e81ddfcdcc Removing obsolete comment 
svn-id: r47609
 2010-01-27 20:55:35 +00:00
Filippos Karapetis
8ff7efea81 Do not try and patch files for resource types greater or equal to audio36 (i.e. audio36, sync36 etc), as these won't work with the current patch scheme 
svn-id: r47604
 2010-01-27 17:31:11 +00:00
Filippos Karapetis
9471e66940 Don't patch audio36 resources, when the associated patches are for audio resources (e.g. the sound effects in LB2CD) 
svn-id: r47603
 2010-01-27 16:59:20 +00:00
Filippos Karapetis
1ddcd178c2 The two unknown fields point to the beginning and end of the sound sample 
svn-id: r47601
 2010-01-27 16:04:46 +00:00
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
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
Filippos Karapetis
219b0de0d2 Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA 
svn-id: r42181
 2009-07-06 16:22:14 +00:00
Filippos Karapetis
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls 
svn-id: r42167
 2009-07-06 10:39:22 +00:00
Filippos Karapetis
b0c908e349 Merged SCI1 versions in one more file 
svn-id: r42098
 2009-07-04 16:36:56 +00:00
Filippos Karapetis
b093511239 - Merged the "early" and "late" SCI1 versions - these are functionally equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early") 
- Cleanup of the vocabulary setting functions
- Cleanup of the cursor manipulation code

svn-id: r42097
 2009-07-04 16:30:20 +00:00
Max Horn
c4f6295330 Fixed some more warnings observed on buildbot 
svn-id: r42010
 2009-07-01 20:51:34 +00:00
Walter van Niftrik
1fb78d577f SCI: Moved audio code from AudioResource to the sfx core. 
svn-id: r41486
 2009-06-12 23:46:23 +00:00
Walter van Niftrik
5e68fbfe87 SCI: Moved SCI1 audio map handling into the resource manager. 
svn-id: r41408
 2009-06-09 19:18:48 +00:00
Walter van Niftrik
f2fe13b064 SCI: Cleanup 
svn-id: r41368
 2009-06-08 12:20:36 +00:00
Walter van Niftrik
a6ed05740f SCI: Moved resource36 handling into resource manager. 
svn-id: r41349
 2009-06-07 19:15:55 +00:00
Walter van Niftrik
e3d3195a43 SCI: Resmgr cleanup and preparations for moving resource36 handling into resmgr. 
svn-id: r41318
 2009-06-07 02:18:38 +00:00
Walter van Niftrik
bc6d19aa1a SCI: Fix audio regression in KQ5CD, introduced in r41205. 
svn-id: r41222
 2009-06-06 12:30:13 +00:00
Walter van Niftrik
61a7b7c625 SCI: Moved the handling of 65535.map into the resource manager. 
svn-id: r41205
 2009-06-06 00:07:18 +00:00
Walter van Niftrik
3c58a6ca8f SCI: Audio: Fixed bug in sample length computation. 
svn-id: r41186
 2009-06-05 01:12:52 +00:00
Walter van Niftrik
8e987c80d1 SCI: Fixed some endian bugs related to speech handling. READ_UINT* are not LE, 
but use native endianness. Thanks to clone2727 for pointing this out.

svn-id: r41181
 2009-06-04 23:55:08 +00:00
Max Horn
fa02e0df7b SCI: Made some members of class Resource protected; some cleanup 
svn-id: r41180
 2009-06-04 22:16:31 +00:00
Walter van Niftrik
3da455420a SCI: Audio: Fixed bug in reading of SOL header. 
svn-id: r41171
 2009-06-04 16:18:35 +00:00
Walter van Niftrik
a440d77408 SCI: Added support for early SCI1.1 audio maps. 
svn-id: r41170
 2009-06-04 15:56:11 +00:00
Walter van Niftrik
28242d289b SCI: Support for 16-bit DPCM. 
svn-id: r41164
 2009-06-04 11:35:17 +00:00
Walter van Niftrik
6e079f7ea8 SCI: Added some of the missing pieces for speech support in CD games. It now partially works. 
svn-id: r41146
 2009-06-03 18:43:22 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't 
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
 2009-05-31 10:02:16 +00:00
Filippos Karapetis
74e87bf05d Some WIP code on the speech used in KQ6CD 
svn-id: r40996
 2009-05-29 13:52:10 +00:00
Filippos Karapetis
d111e33df4 Fixed regression of commit #40904, which caused the audio in KQ5CD to be played incorrectly 
svn-id: r40923
 2009-05-26 19:12:09 +00:00
Filippos Karapetis
dfdc239d1f Silenced MSVC warning 
svn-id: r40916
 2009-05-26 14:54:24 +00:00
Filippos Karapetis
780899fb0e Rewrote the Audio stream parser. The introduction of KQ6 should work more correctly now (apart from Cassima's speech) 
svn-id: r40904
 2009-05-26 10:02:25 +00:00
Filippos Karapetis
16d6499617 WIP code for the speech in the floppy version of KQ6 (still needs work) 
svn-id: r40894
 2009-05-25 19:57:09 +00:00
Johannes Schickel
cb5c26dd53 - Fix various valgrind warnings in the audio sync code 
- Fix crash when qutting KQ 5 CD
(It was caused by resources of type "kResourceTypeSync" getting allocated an "Resource" object instead of an "ResourceSync" object, I hope this is the correct fix)

svn-id: r40888
 2009-05-25 12:47:58 +00:00
Johannes Schickel
c7d9e4dc0c Fix mismatching new[]/delete pair (silences a valgrind warning). 
svn-id: r40887
 2009-05-25 12:41:14 +00:00
Filippos Karapetis
d59796fb54 Objectified the AudioResource code (used for speech and digitized music in CD talkie games) 
svn-id: r40880
 2009-05-25 10:30:19 +00:00
Filippos Karapetis
8ab0f0256e Fixed audio synchronization in the CD version of KQ5 
svn-id: r40855
 2009-05-24 09:40:48 +00:00
Max Horn
bba91075bf removed trailing whitespaces 
svn-id: r40742
 2009-05-20 17:53:31 +00:00
Walter van Niftrik
4d59f620f9 SCI: Changed K_FILEIO_FILE_EXISTS to check regular files too. 
svn-id: r40724
 2009-05-19 11:30:51 +00:00
Walter van Niftrik
df3357159c SCI: Added some stubs for LSL6CD (lores). 
svn-id: r40719
 2009-05-19 02:10:58 +00:00
Filippos Karapetis
87e8f94fde - Moved all the files out of /sci/scicore and into /sci 
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608
 2009-05-15 14:07:45 +00:00