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
61,292 Commits 45 Branches 139 Tags
7331a7cbefed7be415da170a32a2549b1c18fd12
Commit Graph
410 Commits
Author SHA1 Message Date
Max Horn 297542345f SCI: Skip loading HunkTable segments. This fixes a silly bug that can lead to arbitrary numbers of HunkTable segments to be created by repeatedly saving and loading. 
svn-id: r45042
 2009-10-13 18:54:20 +00:00
Filippos Karapetis 1f00be5c15 The _variables array is sized from syncArray, so there's no need to store its size in the savegame 
svn-id: r44940
 2009-10-11 19:23:00 +00:00
Filippos Karapetis 1d3118cf42 Implemented some advanced savegame functionality - loading and deleting savegames from the GMM is now possible, and new saved games will also have thumbnails. Saving from the GMM creates corrupted saved games, so it has been disabled for now 
svn-id: r44930
 2009-10-11 15:51:43 +00:00
Filippos Karapetis 6d030126d7 More work on the Object class 
svn-id: r44921
 2009-10-11 13:46:58 +00:00
Filippos Karapetis d6f5d93dbf Started rewriting the Object struct into a class 
svn-id: r44878
 2009-10-10 15:58:51 +00:00
Filippos Karapetis bfabde4512 Fixed loading again - a regression from commit #44803 
svn-id: r44868
 2009-10-10 12:00:34 +00:00
Walter van Niftrik 6c1cac3956 SCI: kMessage() rewrite 
svn-id: r44860
 2009-10-10 02:16:23 +00:00
Filippos Karapetis 9bb73a8457 Removed the unused _flags variable from EngineState 
svn-id: r44857
 2009-10-09 23:53:37 +00:00
Max Horn 0c457be0fb SCI: Turn reconstruct_scripts into SegManager::reconstructScripts 
svn-id: r44806
 2009-10-08 22:03:55 +00:00
Max Horn 76996301d1 SCI: Removed obsolete stringfrags code 
svn-id: r44803
 2009-10-08 21:29:45 +00:00
Max Horn 42120ed626 Introduce a new struct TimeDate, replacing struct tm in client code. May lead to compilation issues in ports, which should be trivial to fix, though 
svn-id: r44793
 2009-10-08 19:41:38 +00:00
Filippos Karapetis 2d98b72858 Restore the engine state stored within SciGui during loading once more, since it gets replaced during loading. Fixes loading (a regression from #44730) 
svn-id: r44771
 2009-10-08 07:57:26 +00:00
Filippos Karapetis ce75c9270a Removed the unused game_time variable, and fixed the incorrect calculation of start_game_time when restoring a game 
svn-id: r44770
 2009-10-08 07:25:18 +00:00
Filippos Karapetis 1562add631 - Cleaned up the cursor code 
- Renamed gui -> _gui in EngineState, for consistency
- Added a reference to SciGuiCursor in EngineState, to be used by current code
- Renamed setCursorHide -> hideCursor, setCursorShow -> showCursor
- Moved the cursor zone limiting code inside SciGuiCursor. This code is currently not functioning, as we need to call refreshPosition() before each updateScreen() call to limit the cursor position.

svn-id: r44760
 2009-10-07 21:29:47 +00:00
Martin Kiewitz 77b549a0ad SCI: SciGuiCursor class added, cleanup, OSystem removed from SciGui constructor 
svn-id: r44730
 2009-10-07 12:47:53 +00:00
Max Horn db8c6e3f6c SCI: Really remove sci/gui/gui.h include from engine/state.h 
svn-id: r44644
 2009-10-04 22:43:30 +00:00
Max Horn 6ad5840181 SCI: Rename EngineState::segMan to _segMan 
svn-id: r44629
 2009-10-04 18:38:18 +00:00
Willem Jan Palenstijn 0ed87062ed SCI: Add hack to gui to fix loading 
svn-id: r44581
 2009-10-03 23:56:49 +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
Filippos Karapetis fd21bb2611 - Moved the list of synonyms and parser nodes inside the vocabulary class 
- Added a convenience member inside the EngineState struct to access the instance of the Vocabulary class

svn-id: r44481
 2009-09-30 12:17:38 +00:00
Max Horn 2fe6b32968 SCI: Remove EngineState::game_version, it was only used for saving anyway. Also remove syncCStr() 
svn-id: r44358
 2009-09-25 13:02:11 +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 4df106e1f0 Copy the internal game name when loading, and don't recreate it 
svn-id: r44250
 2009-09-22 09:16:16 +00:00
Filippos Karapetis e331269a36 Removed unused variable 
svn-id: r44249
 2009-09-22 09:00:32 +00:00
Max Horn c5cc785802 SCI: Change SystemStrings to use RAW storage consistenly 
svn-id: r44246
 2009-09-22 01:08:42 +00:00
Max Horn 97d1f79e2d SCI: Change SystemString::name from char* to Common::String 
svn-id: r44243
 2009-09-22 00:36:05 +00:00
Max Horn 5fc2428c99 SCI: SegmentObj's now set their type in constructor; replace central SegmentObj::createSegmentObj call in SegManager::allocSegment by several explicit 'new' statements; some extra cleanup 
svn-id: r44242
 2009-09-22 00:35:46 +00:00
Max Horn d2a6713a8e SCI: Replace IntMapper Script::_objIndices and Common::Array Script::_objects by a HashMap -- goodbye, class IntMapper 
svn-id: r44240
 2009-09-21 21:38:43 +00:00
Max Horn 57dfb9bafd SCI: Rename Object::flags and pos to _flags and _pos; tweak scriptObjInit0 and scriptObjInit11 to be more similar 
svn-id: r44234
 2009-09-21 21:35:43 +00:00
Max Horn 5f440854b7 SCI: Add EngineState::_kernel member for convenience 
svn-id: r44173
 2009-09-17 17:00:36 +00:00
Max Horn eb77efda78 SCI: Add a global getSciVersion() function and make use of it 
svn-id: r44170
 2009-09-17 16:50:53 +00:00
Max Horn e40cbe574e SCI: Rename engine/memobj.* to engine/segment.* 
svn-id: r44155
 2009-09-17 13:22:46 +00:00
Filippos Karapetis f890a69428 Changed the way object selectors are accessed, by removing the relevant defines and adding appropriate methods to the Object structure 
svn-id: r44138
 2009-09-17 08:51:38 +00:00
Max Horn 10f898c90e SCI: Rename MemObject -> SegmentObj 
svn-id: r44130
 2009-09-17 00:45:12 +00:00
Max Horn a277123f54 SCI: Rename Script class members, change Script from struct to class 
svn-id: r44126
 2009-09-16 23:32:27 +00:00
Filippos Karapetis e1de3d0f3f Removed some unused variables from the engine state 
svn-id: r44099
 2009-09-15 07:59:48 +00:00
Max Horn bfe1538715 SCI: Misc cleanup 
svn-id: r44093
 2009-09-14 22:34:53 +00:00
Filippos Karapetis 90ae20c3ea - Made obj_get and obj_get_name methods of SegManager (getObject and getObjectName, respectively) 
- Renamed alloc_List -> allocateList, alloc_Node->allocateNode, alloc_hunk_entry->allocateHunkEntry, free_hunk_entry->freeHunkEntry, for consistency

svn-id: r44039
 2009-09-12 00:10:07 +00:00
Max Horn 37e51f1575 Fixed some (pedantic) warnings 
svn-id: r44015
 2009-09-08 22:03:07 +00:00
Max Horn 44b60d2750 SCI: Replace GET_SEGMENT_ANY and GET_OBJECT_SEGMENT macros by new segman methods 
svn-id: r43999
 2009-09-07 06:07:18 +00:00
Max Horn eb8cf07db2 SCI: Rename SegManager::exports_wide to _exportsAreWide and changed it to a bool, and rename setExportWidth() to setExportAreWide() 
svn-id: r43988
 2009-09-06 13:01:26 +00:00
Max Horn a550e2ea10 SCI: Replace "IntMapper *id_seg_map" in SegManager with a Common::HashMap<int,int> 
This simplifies the code considerably. Also changed the savegame format
accordingly, which required me to bump the format version to 10. Old
saves should still load fine.

svn-id: r43986
 2009-09-06 13:00:30 +00:00
Max Horn 1d075291da SCI: Convert saveload code to use the versioning feature of Common::Serializer 
svn-id: r43985
 2009-09-06 12:59:56 +00:00
Max Horn fdbb167ea3 SCI: Cleanup for some SegManager internals 
- rename segGet and getSegment to getScriptSegment; the two can be
  distinguished by the parameter count.
- rename type SCRIPT_GET to ScriptLoadType to conform with our code
  formatting conventions
- rename get_class_address to getClassAddress
- some cleanup

svn-id: r43981
 2009-09-06 12:58:16 +00:00
Filippos Karapetis f5d846d482 Removed the animation_granularity variable from the engine state (it never changes, and it's used in one place only) 
svn-id: r43936
 2009-09-04 07:21:51 +00:00
Filippos Karapetis 142922387c Moved some functions inside the SegManager class, and renamed alloc_clone() to allocateClone() 
svn-id: r43935
 2009-09-04 07:17:34 +00:00
Walter van Niftrik ac078040e1 SCI: Relocate export table when restoring SCI1.1 savegames 
svn-id: r43916
 2009-09-03 11:51:18 +00:00
Filippos Karapetis 9829378a98 Fixed loading again (broken accidentally in rev. 43504 
svn-id: r43913
 2009-09-02 23:11:50 +00:00
Filippos Karapetis 1bbab8f191 Some renaming: 
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
 2009-09-02 12:02:37 +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