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
137,148 Commits 45 Branches 139 Tags
de151ea3fddd6a2d36a41400a55366bd2a6a94de
Commit Graph
526 Commits
Author SHA1 Message Date
Filippos Karapetis 226f0bd23d The menu bar code is no longer used in the new graphics code, and the menu state is no longer stored in saved games 
svn-id: r45854
 2009-11-12 09:24:46 +00:00
Max Horn 53d0bcd594 SCI: Remove remarks about in-place loading, at least for now. 
Not loading in-place has the advantage that it allows to cleanly
cancel loading a savesate, e.g. if we detect a defect during
loading. This is much harder (if not impossible) to achieve if
loading in-place. So I'd prefer if we took advantage of this.
Right now, though, we don't.

svn-id: r45786
 2009-11-09 22:20:59 +00:00
Filippos Karapetis 5daca46946 Removed unused variables and placed some more old code inside INCLUDE_OLDGFX defines 
svn-id: r45668
 2009-11-04 15:32:25 +00:00
Filippos Karapetis c8fbac1517 - Changed the segment manager to be a static part of the engine, and stopped deleting and recreating it when restoring games 
- Merged game_exit(), script_free_vm_memory() and script_free_engine()
- Cleanup

svn-id: r45666
 2009-11-04 14:22:17 +00:00
Filippos Karapetis 12e3375f3b Removed the reference to SciGuiCursor from EngineState 
svn-id: r45660
 2009-11-04 12:19:05 +00:00
Filippos Karapetis f755311114 priority_first and priority_last are not used by the new drawing code, thus the new code didn't handle priority changes by kGraph() 
svn-id: r45658
 2009-11-04 11:52:11 +00:00
Filippos Karapetis 597524b255 Moved most of the code for playing sound effects and speech into a separate class 
svn-id: r45653
 2009-11-04 09:36:18 +00:00
Filippos Karapetis 57266a7cba - Removed status_bar_foreground and status_bar_background variables from the engine state 
- Implemented clearMenuBar() in the new graphics code
- Removed the "status_bar" command, which was used to set custom colors for the status bar

svn-id: r45538
 2009-10-30 14:39:26 +00:00
Filippos Karapetis ff284c9f5b Remove unused includes when INCLUDE_OLDGFX is not set. Implemented the full screen updates that the current menu code is doing using new graphics functions (still unfinished). Some cleanup. 
svn-id: r45536
 2009-10-30 12:33:05 +00:00
Filippos Karapetis 04ab6bc9fc Enclose all of the old graphics code within the INCLUDE_OLDGFX safeguard (defined in sci.h) 
svn-id: r45459
 2009-10-28 13:20:30 +00:00
Filippos Karapetis f0c4290287 Reset the graphics input after reconstructing game scripts. This fixes savegame loading in KQ4 
svn-id: r45350
 2009-10-23 20:10:51 +00:00
Filippos Karapetis 42068f5853 Cleanup 
svn-id: r45337
 2009-10-22 15:12:54 +00:00
Max Horn 9e64255bd1 SCI: Rename game_obj to _gameObj 
svn-id: r45235
 2009-10-18 19:43:27 +00:00
Filippos Karapetis f5b7f85593 Removed unused references to operations.h 
svn-id: r45217
 2009-10-18 10:50:07 +00:00
Willem Jan Palenstijn a74fd21847 SCI: Fix delete/free mismatches 
svn-id: r45196
 2009-10-17 17:59:09 +00:00
Max Horn 2ae08e8478 SCI: Don't save HunkTable segments 
svn-id: r45048
 2009-10-13 20:50:59 +00:00
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