Commit Graph

322 Commits

Author SHA1 Message Date
Filippos Karapetis
c64a69c363 SCI: Resolve some resource related FIXMEs
These were introduced in 4f6d42d.
The odd comment dates back to FreeSCI, as far as our history goes, and
seems to be a leftover from an old refactoring during FreeSCI's history
2012-05-15 03:05:38 +03:00
Willem Jan Palenstijn
4f6d42d77b SCI: Add a few FIXMEs 2012-05-13 16:23:15 +02:00
Matthew Hoops
30e7a0f001 SCI: Fix SCI1.1+ Mac games with resource fork container names 2012-03-08 08:02:58 -05:00
Max Horn
4f8665fc83 COMMON: Move isFoo functions to namespace Common, add doxygen comments 2012-02-20 16:18:27 +01:00
Max Horn
658080deed ALL: Avoid using is* macros from ctype.h
On some systems, passing signed chars to macros like isspace() etc. lead
to a runtime error. Hence, mark these macros as forbidden by default,
and introduce otherwise equivalent alternatives for them.
2012-02-15 16:51:37 +01:00
Willem Jan Palenstijn
56fb56936e SCI: Clean up some memory management and loops 2012-01-15 18:25:00 +01:00
Filippos Karapetis
780b2eff16 SCI: Plug a leak in ResourceManager::detectSciVersion()
Many thanks to digitall for finding this one
2012-01-15 18:34:41 +02:00
Filippos Karapetis
c4b2cd057a SCI: Fixed speech in PQ4 CD 2011-10-29 18:32:50 +03:00
Filippos Karapetis
935eaa175b SCI: Move the palette merging checking code inside the GfxPalette class 2011-10-19 23:52:51 +03:00
Filippos Karapetis
b956b24149 SCI: Added a heuristic to distinguish Mac SCI1.1 from SCI2.1 versions
This removes the hack that checks for the existence of resource.cfg
2011-10-15 01:00:58 +03:00
Filippos Karapetis
d8aaf40090 SCI: Fixed bug #3404466 - "ScummVM crashes when trying to add non-SCI resources file" 2011-09-10 13:47:02 +03:00
Johannes Schickel
5443ef943f SCI: Made some static data const. 2011-09-08 00:35:12 +02:00
Filippos Karapetis
c9873dae43 SCI: Fixed bug #3366295 - "SCI: User-translated files are ignored"
Thanks to tinekefrineke and tdhs for pinpointing the actual problem in the
resource manager
2011-08-26 01:56:50 +03:00
Littleboy
b694a78f62 ANALYSIS: Add static casts to is* functions
This fixes a potential problem with passing char values that would be sign-extended and yield unexpected results.
See http://msdn.microsoft.com/en-us/library/ms245348.aspx
2011-06-23 08:52:52 -04:00
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Ori Avtalion
9414d7a6e2 JANITORIAL: Reduce header dependencies in shared code
Some backends may break as I only compiled SDL
2011-04-28 15:08:58 +03:00
md5
d28344bb55 SCI: Removed unused variables
Thanks to LordHoto and the trusty -Wunused-but-set-variable option :)
2011-04-27 13:13:35 +03:00
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
md5
9e1245c420 SCI: Fixed version and scene transitions for SCI1 Mac games 2011-03-13 23:50:40 +02:00
md5
4ddc66d68e SCI: Initial handling of the views in Longbow Amiga. Still not right 2011-03-07 13:23:52 +02:00
md5
dbd3f440d2 SCI: Added some support code for Longbow Amiga 2011-03-05 18:47:13 +02:00
md5
ef939772b3 SCI: Added support for 16/32 color view and picture patches
16 color patches (*.p16 and *.v16) are used in 16 color EGA SCI1 games
32 color patches (*.p32 and *.v32) are used in 32 color Amiga SCI1 games
Removed a workaround for SCI1 EGA (bug #3044500), as that bug has been
fixed already in the view patch. Thanks to waltervn for observing this.
2011-03-04 17:16:54 +02:00
md5
6b41673fab SCI: Amiga SCI1 middle games are actually SCI1 late
This fixes a lot of glitches, caused by the differences between the two
versions
2011-03-04 14:27:25 +02:00
md5
72f65b3946 SCI: Renamed SCI_VERSION_1_EGA to SCI_VERSION_1_EGA_ONLY
This renaming allows us to better distinguish that this version is for games
that only had an EGA version, and avoid confusion with newer SCI1 game releases
with EGA graphics (e.g. KQ5 EGA). The only game with this SCI version is QFG2,
a SCI1 EGA game with a parser. Also, added some games for each SCI version.
2011-02-27 16:48:53 +02:00
Matthew Hoops
fe250d2755 SCI: Don't error out when a Mac resource has size 0 2011-02-20 12:44:59 -05:00
md5
7cf482e721 SCI: Reverted r914fe95, and silenced a false positive warning 2011-02-19 20:30:57 +02:00
md5
914fe95903 SCI: Added a FIXME for the KQ5 FM-TOWNS resource handling code 2011-02-19 20:22:44 +02:00
Matthew Hoops
758e495872 SCI: Add support for the KQ5 FM Towns resource format
Thanks to alexbevi for providing details on the format
2011-02-16 14:24:38 -05:00
Matthew Hoops
fad3e64550 SCI: Fix GK2 Mac picture 2315
It hardcodes the picture so it doesn't get run with the decompressor
2011-02-13 18:00:39 -05:00
Filippos Karapetis
e4b46bd159 SCI: Added resource manager support for changing the audio directory dynamically. Also,
moved some audio-specific resource code inside resource_audio.cpp

This functionality is used by kSetLanguage(), called when switching the language in
MUMG Deluxe from the game's main menu.

svn-id: r55872
2011-02-10 16:48:29 +00:00
Filippos Karapetis
c7c0198e27 SCI: Renamed addInternalSources -> addAudioSources and separated the script chunk loading code
svn-id: r55866
2011-02-10 12:57:43 +00:00
Filippos Karapetis
d915560f44 SCI: Moved some audio resource code to resource_audio.cpp
svn-id: r55865
2011-02-10 12:40:48 +00:00
Matthew Hoops
aac6bd5181 SCI: Improve speed of Mac resource fork sources
svn-id: r55859
2011-02-09 17:54:34 +00:00
Matthew Hoops
0bf787736c SCI: Fix Mac SCI32 subdirectories
svn-id: r55783
2011-02-05 08:27:33 +00:00
Matthew Hoops
a08fa00d49 SCI: Fix detectHires() for Mac SCI32 games
svn-id: r55781
2011-02-05 08:18:03 +00:00
Matthew Hoops
496ca9a669 SCI: Fix KQ6 Mac audio resources
A regression from r55715

svn-id: r55751
2011-02-03 12:42:52 +00:00
Matthew Hoops
3c04db1ebf SCI: Set Mac cursors as a non-compressable type too
svn-id: r55720
2011-02-02 15:21:24 +00:00
Matthew Hoops
a6891a4372 SCI: Fix Mac sync resource support
svn-id: r55716
2011-02-02 02:20:25 +00:00
Matthew Hoops
1e14752d4d SCI: Add support for Mac audio36/sync36 resources in resource forks
svn-id: r55715
2011-02-02 00:23:46 +00:00
Matthew Hoops
26f5523156 SCI: Mac SCI1.1+ games can use SYNC as the resource type for sync resources too
svn-id: r55708
2011-02-01 15:17:39 +00:00
Matthew Hoops
956dc54e3d SCI: Update the Mac version detection comments
svn-id: r55697
2011-01-31 23:09:22 +00:00
Matthew Hoops
4c8a9ab24a SCI: Add support for Mac SCI1.1+ resource compression
Mac SCI1.1+ games should now start up. QFG1 and Hoyle4 are playable. GK1 starts its scripts, but errors out soon after. There are still some View bugs with each (somehow, view decompression seems to be adding a blank line after each line?).

*Much* thanks to Walter for his help.

svn-id: r55696
2011-01-31 22:45:51 +00:00
David Turner
f2205a5a01 SCI: Close Memory Leaks in SCI Resource Loading, reported by Valgrind.
svn-id: r54916
2010-12-14 23:30:22 +00:00
Johannes Schickel
c14399c229 SCI: Slight formatting fix.
svn-id: r54737
2010-12-02 17:03:21 +00:00
Lars Skovlund
0ac28d1fbf Disable error message regarding RESOURCE.AUD/.SFX for now.
svn-id: r54735
2010-12-02 13:29:49 +00:00
Filippos Karapetis
a702ad5123 SCI3: added a SCI3 implementation of findGameObject(), based on a patch by lskovlun
svn-id: r54284
2010-11-17 11:17:38 +00:00
Filippos Karapetis
f44b084deb SCI: Some restructuring. Added some SCI3 placeholders/stubs
svn-id: r54280
2010-11-17 08:53:02 +00:00
Filippos Karapetis
0470e47145 SCI: The heap was a separate resource in SCI1.1 - SCI2.1 games only. It was later
merged into the script files again in SCI3

svn-id: r54279
2010-11-17 08:30:08 +00:00
Matthew Hoops
405fd0b5eb SCI: Update resource types for SCI2.1/3
svn-id: r54220
2010-11-13 00:20:23 +00:00