ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,688 Commits 45 Branches 139 Tags
3ac88c16ea63243a46444e5754a94e41302f2d64
Commit Graph
397 Commits
Author SHA1 Message Date
Filippos Karapetis 58190c36b4 SCI: Made the object map hashmap of the Script class private 2011-11-05 10:07:03 +02:00
Filippos Karapetis 267c6f1756 SCI: Made more fields of the Script class private. Some cleanup. 2011-11-05 03:00:42 +02:00
athrxx da96afe167 SCI: fix thread lockup issue when loading savegames using a sound driver which depends on the mixer thread for timer calls. 
The issues seems to be known. See comments (not by me) in SciMusic::clearPlayList().
For the same reason mentioned there the mutex may also not be locked before calling clearPlayList().
 2011-10-22 19:53:24 +02:00
Filippos Karapetis 9fd66deb43 SCI: Changes to the sound resource initialization code 
- Unified the sound resource initialization code in
processInitSound() and reconstructPlayList()
- Now checking the "Mixed Adlib/MIDI" mode checkbox for SCI1.1 digital
audio sound effects, like it's done for SCI0 - SCI1 sound effects. If
it's unchecked, their MIDI counterparts will play instead, if
available
 2011-09-26 20:02:34 +03:00
Max Horn 477d6233c3 ENGINES: Change 2nd param of Engine::saveGameState to Common::String 2011-06-02 18:31:59 +02:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
md5 12e7d3078b SCI: Cleanup 2011-03-08 20:13:08 +02:00
Matthew Hoops ee09af6a12 SCI: Fix loading SCI32 games 
The frames/items in GfxFrameout need to be cleared upon loading
 2011-02-14 22:38:12 -05:00
md5 8ef4594f9b SCI2+: Set the correct segment for SCI32 strings/arrays when loading 
This was an omission, observed after a discussion with clone2727
 2011-02-15 01:30:33 +02:00
Matthew Hoops 31539697dc SCI: Fix loading pre-version 28 saved games 
This is a regression from a9b051beff
 2011-02-14 16:01:04 -05:00
Max Horn a9b051beff SCI: Simplify SegManager::saveLoadWithSerializer, cleanup 
svn-id: r55883
 2011-02-11 17:05:27 +00:00
Filippos Karapetis 5e5410f891 SCI: Only sync the synonyms vocabulary if the game actually has one (thanks wjp) 
svn-id: r55033
 2010-12-24 14:56:04 +00:00
Filippos Karapetis 9af30a2546 SCI: Now saving/loading the list of synonyms (set by kSetSynonyms), like SSCI did 
This is a more correct way of fixing bug #3037618 than in rev #55017.
- Changed replaceant/replacement to be uint16's (they're very small positive
values, usually smaller than 4096)
- Changed SynonymList to an Array (so that it can be saved/loaded)
- Removed the PQ2 script patch to Game::replay()
- Added savegame history

svn-id: r55032
 2010-12-24 14:47:47 +00:00
Matthew Hoops 65f218dce0 SCI: Silence warnings 
svn-id: r54806
 2010-12-07 01:12:48 +00:00
Filippos Karapetis de2ef2edc0 SCI: Removed the system strings code and replaced it with a much more simplified version, thus greatly simplifying handling of system strings 
svn-id: r54805
 2010-12-07 00:47:05 +00:00
Filippos Karapetis 91e42bbcb9 SCI: Reverted changes to savegame.cpp made in r54510, as that still occurs 
svn-id: r54511
 2010-11-27 18:23:39 +00:00
Filippos Karapetis 3485d433c5 SCI: Fixed bug #3034713 - "ICEMAN Demo: Fails to find base object" 
This could happen because objects in scripts can be in the wrong order.
Same thing happens in the French and German version of KQ5 (bug #3035396).
Removed the scriptObjRemove() method, which is in fact a hack.

svn-id: r54510
 2010-11-27 18:08:47 +00:00
Filippos Karapetis 601494cad4 SCI: implemented reverb handling and related functionality 
svn-id: r54478
 2010-11-25 16:09:45 +00:00
Filippos Karapetis dcd1326970 SCI: Some renaming and added several TODOs concerning reverb 
svn-id: r54461
 2010-11-24 16:01:30 +00:00
Filippos Karapetis 203ff5e19a SCI: Fixed bug #3104624 - "PQ3: Crash when loading saved game on the highway" 
svn-id: r54197
 2010-11-11 10:09:57 +00:00
Filippos Karapetis 1e9407be3f SCI: Added comments for rev. 54150 and fixed a typo 
svn-id: r54153
 2010-11-09 11:57:54 +00:00
Lars Skovlund 416025cda9 Fix assertion failure in SCI0 saving code 
svn-id: r54138
 2010-11-08 11:02:43 +00:00
Filippos Karapetis 5de2668939 SCI: Some changes regarding the string heap in saved games 
- Maintain the state of the string heap space in saved games
- Merged SegManager::reconstructScripts() inside SegManager::saveLoadWithSerializer()
- Disabled a now unnecessary script patch for the cipher puzzle in Castle of Dr. Brain, and performed some cleanup for another disabled patch
- Removed direct access to the _baseObj variable of objects

svn-id: r54133
 2010-11-08 00:18:34 +00:00
Martin Kiewitz 130365ef0d SCI: fixing port restoring 
- recalculate _freeCounter
- dont push disposed windows onto windowlist

svn-id: r54017
 2010-11-01 20:08:42 +00:00
Martin Kiewitz a46b1adeae SCI: fixing bug when restoring ports 
fixes assert

svn-id: r54016
 2010-11-01 19:56:01 +00:00
Martin Kiewitz eefa151d70 SCI: saving/restoring script created windows now 
fixes "GfxPorts::kernelSetActive" error
based on code by [md5]

svn-id: r54012
 2010-11-01 16:09:33 +00:00
Filippos Karapetis 43221a3253 SCI: Removing obsolete function parameter 
svn-id: r53986
 2010-10-31 20:57:50 +00:00
Filippos Karapetis dca3c8d8bf SCI: Play time related changes 
- Added support for savegame play time
- Removed obsolete variables for calculating the play time (EngineState::gameStartTime and Console::_enterTime)
- Renamed some variables to camelCase

svn-id: r53974
 2010-10-31 01:45:24 +00:00
Martin Kiewitz a8df677c04 SCI: save/restore intensity of sysPalette 
fixes bug #3072868
should be save for backporting

svn-id: r52875
 2010-09-24 09:56:50 +00:00
Martin Kiewitz d5d8434fd6 SCI: now pausing/unpausing music in replaced restore dialog 
dialog will not get replaced in sci32, nor in mother goose. Enable by adding "scireplacedialog" inside scummvm section of scummvm.ini file. Note: this feature is experimental

svn-id: r52318
 2010-08-24 09:00:53 +00:00
Filippos Karapetis 397df8f350 SCI: added a wrapper for GUI::MessageDialog 
svn-id: r52171
 2010-08-17 20:33:22 +00:00
Filippos Karapetis 7935ebf4a3 SCI: Converted an error back into a warning when loading games 
svn-id: r51816
 2010-08-07 00:22:57 +00:00
Willem Jan Palenstijn 74304fb790 SCI: Fix infinite recursion when saving. 
This was a regression from r51727.

svn-id: r51731
 2010-08-04 12:11:23 +00:00
Max Horn fcf3ea61fe SCI: Simplify code (let the compiler interfer types where possible) 
svn-id: r51727
 2010-08-04 08:26:09 +00:00
Max Horn 5ed9ddaa2c SCI: Remove reference to common/serializer.h from vm_types.h 
svn-id: r51726
 2010-08-04 08:25:39 +00:00
Matthew Hoops 0eaa9bddb6 SCI: Fix restoring SCI32 games (a regression of r51712) 
svn-id: r51723
 2010-08-04 05:15:01 +00:00
Martin Kiewitz 2e11c1cf96 SCI: reset ports when restoring 
fixes qfg3/fairy tales restoring (bug #3035626)
also fixes ScummVM menu restoring while a window is shown (e.g. sq5)

svn-id: r51712
 2010-08-03 19:43:16 +00:00
Filippos Karapetis 32807512d9 SCI: Cleanup 
svn-id: r51687
 2010-08-03 12:41:36 +00:00
Johannes Schickel a76f5449bc SCI: Yet another slight leak fix. 
svn-id: r51670
 2010-08-02 23:03:04 +00:00
Johannes Schickel 4e33b7a3be GRAPHICS: Renamed skipThumbnailHeader to skipThumbnail. 
svn-id: r51668
 2010-08-02 22:28:30 +00:00
Johannes Schickel 0dba655085 SCI: Fix memory leak. 
This was a quite bad leak in gamestate_restore. It was caused by the code only
deleting the Graphics::Surface object but not its data.

I changed the code to use skipThumbnailHeader now, since the code actually
ignores the thumbnail anyway.

svn-id: r51667
 2010-08-02 22:27:50 +00:00
Martin Kiewitz 2d76fe0092 SCI: kGameIsRestarting returns 2 when we restored 
fixes castle of dr. brain save issue in puzzle room, fixes island of dr. brain save issue when saving in first room

svn-id: r51538
 2010-07-31 14:09:42 +00:00
Martin Kiewitz c422e39bf8 SCI: implemented kPalette(save/restore) 
svn-id: r51381
 2010-07-27 17:51:44 +00:00
Filippos Karapetis 19042d7873 SCI: Actually sync kPalVary data when saving/loading 
svn-id: r51198
 2010-07-23 08:26:20 +00:00
Filippos Karapetis 9db77be9d4 SCI: Dropped support for the very old savegame versions 12 and 13 (hopefully, the last ones to be dropped) 
svn-id: r51197
 2010-07-23 08:22:13 +00:00
Martin Kiewitz 15eebdb061 SCI: some changes to kPalVary saving 
still needs to get tested

svn-id: r51196
 2010-07-23 08:08:27 +00:00
Filippos Karapetis 3aa4f76ee4 SCI: Now saving the kPalVary state inside savegames 
svn-id: r51194
 2010-07-23 07:36:55 +00:00
Filippos Karapetis 8eca9d6acb SCI: Fixed a bug when loading some saved games (sometimes, the execution stack wasn't cleared properly when loading and you couldn't save or restore) 
svn-id: r51140
 2010-07-22 12:38:48 +00:00
Martin Kiewitz 625af1260b SCI: checking if within kernel function before overwrite a save (thx @ digitall) 
svn-id: r50962
 2010-07-17 17:58:50 +00:00
Martin Kiewitz ba776fb293 SCI: implemented subsignatures for kDoSound 
svn-id: r50755
 2010-07-09 12:06:41 +00:00