Commit Graph

38079 Commits

Author SHA1 Message Date
Filippos Karapetis
ba11596572 SCI: Silenced warning when no audio decoder is compiled in
svn-id: r49351
2010-05-31 12:36:42 +00:00
Filippos Karapetis
ff40247376 Hopefully fixed compilation
svn-id: r49350
2010-05-31 12:27:13 +00:00
Filippos Karapetis
cc025ace18 The code that loads saved game from the launcher
can now load SCI2 saved games. Added an explanation
why the injected call is necessary

svn-id: r49349
2010-05-31 12:13:50 +00:00
Martin Kiewitz
a963917e89 SCI: added TODO at kReadNumber space code
svn-id: r49348
2010-05-31 12:11:42 +00:00
Paul Gilbert
088e6456ea In progress work implementing the animation player
svn-id: r49347
2010-05-31 12:10:30 +00:00
Filippos Karapetis
3f4302214c The save/load object init code is now unified with the regular object init code
svn-id: r49346
2010-05-31 11:25:59 +00:00
Martin Kiewitz
9d50dac101 SCI: skip spaces in kReadNumber - this happens in lsl3 intro
svn-id: r49345
2010-05-31 09:31:05 +00:00
Martin Kiewitz
7001d3e615 SCI: when getting invalid chars in kReadNumber don't error() out, but create a warning - we get invalid chars in the intro of lsl5, cause currently unknown
svn-id: r49344
2010-05-31 09:21:15 +00:00
Filippos Karapetis
66d4bddb30 Merged several script instantiation-related functions inside script_instantiate()
svn-id: r49343
2010-05-31 08:11:49 +00:00
Filippos Karapetis
05357d0f2a Cleanup
svn-id: r49342
2010-05-31 07:34:18 +00:00
Matthew Hoops
2a0f91444f Ignore v2 compressed audio chunks instead of treating them as Huffman DPCM. Should fix playback of at least the video portion of those videos (found in later Broken Sword releases).
svn-id: r49340
2010-05-31 01:27:57 +00:00
Filippos Karapetis
693618d89a Slight cleanup
svn-id: r49339
2010-05-31 00:04:38 +00:00
Filippos Karapetis
50cd1d1da4 Limited access to the script export table and synonyms block
svn-id: r49338
2010-05-30 23:31:33 +00:00
Max Horn
4e25867a67 SCI: Merge setLockers(1) call into Script::init
svn-id: r49337
2010-05-30 23:00:32 +00:00
Filippos Karapetis
a0ee93ece5 SCI: Script exports and synonyms are now initialized when a script is loaded. Removed a sanity check inside script_instantiate_sci0 for a bug which no longer exists
svn-id: r49336
2010-05-30 21:49:07 +00:00
Matthew Hoops
e13abd77e9 Add md5's for Myst ME and Riven DVD French.
svn-id: r49335
2010-05-30 21:44:26 +00:00
Filippos Karapetis
3b96e4833e Cleanup
svn-id: r49334
2010-05-30 20:30:07 +00:00
Filippos Karapetis
1fd3877ec7 Cleanup
svn-id: r49333
2010-05-30 20:18:42 +00:00
Filippos Karapetis
dc4d61f718 - Merged the SCI0 scriptRelocate() and SCI11 heapRelocate() functions inside relocate(). scriptRelocate checked one more relocation entry, which seems wrong, so we're now checking for the correct number of relocations in all SCI versions
- Re-added the error when script + heap exceed 64KB (better than an assert) - this should theoretically never happen, and it never has for the games tested
- Removed the relocated sanity check - again, it shouldn't occur (else something else is wrong)

svn-id: r49332
2010-05-30 20:06:50 +00:00
Filippos Karapetis
9c2da78ba9 kScriptID can be used to load scripts with no exports. Don't throw warnings in this case if no export is requested, as it's perfectly normal behavior
svn-id: r49331
2010-05-30 20:01:25 +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
29c2f30558 Unified the script loading code, and marked an issue with the SCI11 heap addresses
svn-id: r49329
2010-05-30 17:02:21 +00:00
Filippos Karapetis
5cdb13b3e8 Made load_script() a member of the Script class
svn-id: r49328
2010-05-30 16:38:08 +00:00
Filippos Karapetis
c32e88fe0b Limit access to the _bufSize, _scriptSize and _heapSize members of the Script class
svn-id: r49327
2010-05-30 16:14:31 +00:00
Filippos Karapetis
0276ec835e Fixed findGameObject() for SCI11 games
svn-id: r49326
2010-05-30 15:17:29 +00:00
Johannes Schickel
ff3f0f5d65 Split test cases for internal and external storage.
svn-id: r49325
2010-05-30 13:42:04 +00:00
Johannes Schickel
9521f8d008 Typo fixes.
svn-id: r49324
2010-05-30 13:41:40 +00:00
Johannes Schickel
f02e31f2fc Fix non-const version of Common::String::begin.
Common::String::begin now assures the storage is a unique one, i.e. there are
no other Common::String objects pointing at it. This allows for safe use of
the writable iterators (and thus fixes the test case added with my last commit)

svn-id: r49323
2010-05-30 13:10:44 +00:00
Johannes Schickel
0e9156c7c4 Add a (currently) failing test for reference logic in Common::String. (Taken from an example by fuzzie)
svn-id: r49322
2010-05-30 13:10:23 +00:00
Johannes Schickel
d0c79d21e9 Fix file length of zip file members inside ZipArchive (thanks to fuzzie for reporting).
svn-id: r49321
2010-05-30 12:44:59 +00:00
Lars Skovlund
dbe561c59b Clarify reasoning behind hack in Script::scriptRelocate()
svn-id: r49320
2010-05-30 10:27:39 +00:00
Yotam Barnoy
6884ffc291 PSP: added preliminary support for using ME hardware to play MP3 files. If the decoder fails to load, MAD is used instead. Disable with DISABLE_PSP_MP3.
svn-id: r49319
2010-05-30 09:47:00 +00:00
Filippos Karapetis
5f2ff0b1e7 Limit access to the _classTable array (now it's directly accessible only inside saveLoadWithSerializer()
svn-id: r49318
2010-05-29 23:56:37 +00:00
Filippos Karapetis
67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
2010-05-29 23:37:15 +00:00
Max Horn
4ecacdad16 SCI: Merge Script::relocateBlock and Object::relocate
The shared code now resides in a new static function named
relocateBlock, which is invoked by the two methods.

svn-id: r49316
2010-05-29 23:09:00 +00:00
Max Horn
42d6ed880b SCI: Make Script::_exportTable const (yay :-)
svn-id: r49315
2010-05-29 21:42:42 +00:00
Neil Millstone
5143e7fff4 Fix typo(?) which prevents streaming code from compiling.
svn-id: r49314
2010-05-29 20:32:25 +00:00
Neil Millstone
989c1fdddd DS: Various fixes to allow the DS port to compile on DevkitARM r30 and libnds 1.4.3.
svn-id: r49313
2010-05-29 20:30:54 +00:00
Filippos Karapetis
d3bcb10861 Cleanup
svn-id: r49312
2010-05-29 15:47:28 +00:00
Filippos Karapetis
a6156a6805 Removed the scriptRelocateExportsSci11() hack. The open spell in QFG1VGA works now (thanks to waltervn for all his help on this)
svn-id: r49311
2010-05-29 15:29:27 +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
Torbjörn Andersson
928eafcccf Fixed potential memory leak found by cppcheck. Though I'm guessing that if this
case happens, we may have bigger problems...

svn-id: r49307
2010-05-29 08:14:50 +00:00
Torbjörn Andersson
1c32db1e08 Removed some unused variables, found by cppcheck.
svn-id: r49306
2010-05-29 08:09:47 +00:00
Filippos Karapetis
5d21ff280a Silenced some superfluous warnings in KQ5CD
svn-id: r49294
2010-05-28 16:47:30 +00:00
Filippos Karapetis
5b12fda059 Added some more info when severe script errors occur
svn-id: r49293
2010-05-28 12:37:54 +00:00
Filippos Karapetis
b2e4e4b340 Cleaned up detectGfxFunctionsType() slightly, and made it work for Hoyle 1 and 2 properly.
svn-id: r49292
2010-05-28 12:36:47 +00:00
Filippos Karapetis
d9c0abe0b8 Cleanup
svn-id: r49290
2010-05-28 10:53:03 +00:00
Filippos Karapetis
e694b66e4f Added comments to kMergePoly()
svn-id: r49289
2010-05-28 10:52:22 +00:00