15934 Commits

Author SHA1 Message Date
Tony Puccinelli
66b42d486b added intermediary function 'findGameOnePlugAtATime' and switched load game and run game code to use it. Added checks for DYNAMIC_MODULES defines to the checks for NEW_PLUGIN_DESIGN_FIRST_REFINEMENT
svn-id: r51746
2010-08-05 00:26:46 +00:00
Tony Puccinelli
95e56f2052 merged trunk into branch and corrected __PS2__ to __PLAYSTATION2__ in a couple files
svn-id: r49435
2010-06-05 01:05:19 +00:00
Paul Gilbert
3a5fe4ca00 Bugfix for wrong parameter order in scene resources load method call. Also added fragment to destroy an active animation when it's finished animating
svn-id: r49434
2010-06-04 22:53:26 +00:00
David Turner
8b102ab7af SCI: Fix for Valgrind Warning in Palette.
svn-id: r49433
2010-06-04 20:06:59 +00:00
Filippos Karapetis
722c4f1b8d Some more work on channel remapping: Moved the remapping code to the music loading code (still disabled)
svn-id: r49430
2010-06-04 15:01:26 +00:00
Filippos Karapetis
fdc9bbcbf5 Simplified the channel monitoring code inside the SoundResource class
svn-id: r49429
2010-06-04 14:53:12 +00:00
Nicola Mettifogo
9906030312 Ensure that zones/animations always get the same index number.
When a zone/animation is skipped by the parser because already
loaded, the index is now increased. This does not affect NS, since
indexes are only used for scene sorting there, but is relevant for
BRA, where indexes need to be coherent across location changes.

Patch #3004008 by fuzzie.

svn-id: r49428
2010-06-04 13:48:09 +00:00
Paul Gilbert
3d98f679e7 Bugfix for the loading of the animation frame list
svn-id: r49427
2010-06-04 12:51:06 +00:00
Paul Gilbert
86462c66a0 Added code and support routines for destroying animations correctly, which also necessitated changing the sprite list code
svn-id: r49426
2010-06-04 11:28:30 +00:00
Walter van Niftrik
997fdac427 SCI: Replace strncpy with Common::strlcpy
svn-id: r49425
2010-06-04 10:51:27 +00:00
Walter van Niftrik
a8acf7468c SCI: Add savegame version check in CheckSaveGame
svn-id: r49424
2010-06-04 10:36:49 +00:00
Walter van Niftrik
f1a55a9c67 SCI: Cleanup
svn-id: r49423
2010-06-04 10:15:13 +00:00
Johannes Schickel
664c86f25d Replace two uses of ::qsort by Common::sort.
svn-id: r49418
2010-06-03 23:37:05 +00:00
Johannes Schickel
02ed1a684a - Made some methods const
- Prefer const_iterator over iterator in SciMusic::findUsedChannels

svn-id: r49417
2010-06-03 23:07:53 +00:00
Filippos Karapetis
8dd7537a55 A first attempt at channel remapping (currently disabled)
svn-id: r49416
2010-06-03 22:13:23 +00:00
Filippos Karapetis
ddf7449b00 Added code to get which channels are used by a sound. Also, fixed a crash when using Sierra's GM patches, a regression from commit #49391.
svn-id: r49415
2010-06-03 22:00:50 +00:00
Filippos Karapetis
1973bd5a71 Added channel remapping to MidiParser_SCI (currently unused)
svn-id: r49414
2010-06-03 21:57:49 +00:00
Filippos Karapetis
576306c323 Re-enabled the cursor position limiting code
svn-id: r49413
2010-06-03 21:52:21 +00:00
Torbjörn Andersson
038ac90482 Renamed some variables to silence GCC warnings.
svn-id: r49412
2010-06-03 21:13:08 +00:00
Filippos Karapetis
7f0b0a83ed Fixed crashing with wave file patches, a regression from commit #49391
svn-id: r49411
2010-06-03 20:42:06 +00:00
Paul Gilbert
26860b8e51 Properly implemented the logic for loading the correct interface background as specified in a scene's resources
svn-id: r49409
2010-06-03 10:46:55 +00:00
Filippos Karapetis
2ae4c5796b The setCursor selector is no longer used for the detection of the kSetCursor() kernel function semantics
svn-id: r49408
2010-06-03 10:44:50 +00:00
Filippos Karapetis
f1af6bad6d Fixed compilation
svn-id: r49407
2010-06-03 10:26:51 +00:00
Filippos Karapetis
86b452d36c Moved several object-related defines inside vm.h into segment.h, where the Object class resides. Also, removed several unused defines
svn-id: r49406
2010-06-03 10:16:21 +00:00
Paul Gilbert
86dcc28342 Moved the MADS interface view into mads_scene.cpp and did a major cleanup of scene loading code
svn-id: r49405
2010-06-03 09:34:32 +00:00
Matthew Hoops
14a4d8f8b0 Fix a regression from r49377 - we should be checking against code in addition to index for duplicate MLST's.
svn-id: r49395
2010-06-02 17:04:55 +00:00
Filippos Karapetis
c4bdca72d7 Fixed regression from commit #49332 (merging of the SCI0 and SCI11 relocate functions, where the SCI0 equivalent had a +1 count): it seems that we should skip over zero exports, however the total number of valid exports remains the same. Fixes KQ5 and QFG2. This also fixes the relocation calculation of script 71 in SQ3, so remove the comment that the script has broken relocation entries
svn-id: r49394
2010-06-02 15:31:20 +00:00
Matthew Hoops
a8deacfc7e In Riven, if we get a change card opcode on a mouse down event, ignore the next mouse up event so we don't misinterpret that as an event in the next card; minor cleanup.
svn-id: r49393
2010-06-02 15:26:35 +00:00
Filippos Karapetis
af3fec8c26 - Fixed findGameObject() to properly handle SCI0-SCI1 games where the first block of script 0 isn't the exports block
- Changed many places where Common::File is used directly to use Common::SeekableReadStream instead (in order to ultimately remove the SCI_detection hack in the fallback detector)

svn-id: r49391
2010-06-02 13:17:36 +00:00
Matthew Hoops
4493080220 If we can't find the game object or game ID in fallback detection, break out instead of assuming the script is there. Fixes a segfault when detecting an LSCI game.
svn-id: r49389
2010-06-02 02:55:55 +00:00
Max Horn
767edc91fa OSYSTEM: Get rid of kFeatureAutoComputeDirtyRects
svn-id: r49388
2010-06-02 00:52:57 +00:00
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
Matthew Hoops
42b22d16f6 Fix videos in Riven activated from a different card from which they are played; minor cleanup.
svn-id: r49377
2010-06-01 17:01:22 +00:00
Filippos Karapetis
65f3cfcbd8 Stop reconstructing the engine state when restoring, but reset it instead
svn-id: r49376
2010-06-01 15:48:17 +00:00
Max Horn
1f54cdf90d SCI: Fix malloc<->new mismatch in SysStrings, try to increase readability
svn-id: r49375
2010-06-01 15:38:34 +00:00
Filippos Karapetis
9c92bd1b81 The parser vocabulary remains static throughout the game, thus it has been removed from the engine state
svn-id: r49373
2010-06-01 15:11:20 +00:00
Filippos Karapetis
e083c20da1 The system strings segment is a fixed segment of the segment manager, which doesn't change during the game, thus move all the system strings code and variables inside the segment manager
svn-id: r49372
2010-06-01 14:41:48 +00:00
Filippos Karapetis
25fb93465d Added a new console command, verify_scripts, used for sanity checking of SCI1.1-SCI2.1 game scripts
svn-id: r49364
2010-05-31 22:57:05 +00:00
Filippos Karapetis
844ef9ba1a Merged all the script relocation code inside script_instantiate(), and changed the warning when reading an invalid species into an error (as it's severe, and if it happens it means something is seriously wrong)
svn-id: r49361
2010-05-31 18:35:13 +00:00
Filippos Karapetis
de2e935b2c Wrote the initialization code for the exports and synonyms table to make more sense and fixed a bug with the initialization of the synonyms pointer, introduced with rev #49336
svn-id: r49360
2010-05-31 18:31:37 +00:00
Johannes Schickel
5bb4fadc4c Fix change in r49356, Common::strlcpy should only be used on zero terminated source strings.
The original code change with r49086 did only aimed at zero terminating
the szFilename string (as the comment suggests), so I now changed it
to use memcpy and a manual placement of the terminating zero.

svn-id: r49357
2010-05-31 18:05:39 +00:00
David Turner
d1da820a75 Fix for DW2 engine abort with message "Cannot find file hienergy.sc!".
Bug introduced by r49086 change which could trim the last character of filenames.

svn-id: r49356
2010-05-31 15:16:46 +00:00
Martin Kiewitz
753fdd6c12 SCI: break on anything, warn on anything but spaces in kReadNumber
svn-id: r49355
2010-05-31 13:52:07 +00:00
Filippos Karapetis
b5a2e3c758 Fixed operator precedence warning
svn-id: r49353
2010-05-31 12:43:28 +00:00
Willem Jan Palenstijn
2bebba8c94 Fix warning, whitespace
svn-id: r49352
2010-05-31 12:38:15 +00:00
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