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
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
4076 Commits
Author SHA1 Message Date
Max Horn 996b9cc74b SCI: cleanup 
svn-id: r44241
 2009-09-21 21:39:00 +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 7f728af76e SCI: Workaround for crash in debugger's backtrace 
svn-id: r44239
 2009-09-21 21:38:07 +00:00
Max Horn 43da40996b SCI: Change kAnimate to actually tail recurse 
svn-id: r44238
 2009-09-21 21:37:47 +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 c2455aad87 SCI: Move CallsStruct into vm.cpp, the only place it is being used 
svn-id: r44172
 2009-09-17 16:56:36 +00:00
Max Horn f2d2276c4a SCI: Move some selector related function into a new file selector.cpp 
svn-id: r44171
 2009-09-17 16:53:58 +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 9651562e72 SCI: Rename WAS_FUNCT_NR to FAKE_FUNCT_NR; turn some #defines into enums 
svn-id: r44169
 2009-09-17 16:49:31 +00:00
Max Horn c38f150d56 SCI: Moved Kernel::findSelector from vocabulary.cpp to engine/kernel.cpp 
svn-id: r44161
 2009-09-17 14:54:11 +00:00
Max Horn e3e1c0754f SCI: Properly hook up (I hope) CantBeHere instead of CanBeHere in SCI versions that need it 
svn-id: r44160
 2009-09-17 14:53:57 +00:00
Max Horn 15652675b2 SCI: Removed dead code 
svn-id: r44159
 2009-09-17 14:53:42 +00:00
Max Horn e40cbe574e SCI: Rename engine/memobj.* to engine/segment.* 
svn-id: r44155
 2009-09-17 13:22:46 +00:00
Max Horn 23c64c1fd6 SCI: Simplify code in Kernel::checkStaticSelectorNames a bit (don't treat nodePtr & cantBeHere special) 
svn-id: r44154
 2009-09-17 13:22:15 +00:00
Max Horn 730c7c9641 SCI: Get rid of the not_register() hack 
svn-id: r44153
 2009-09-17 13:22:00 +00:00
Max Horn 364640cfd5 SCI: Rename selector_map_t -> SelectorCache and _selectorMap -> _selectorCache 
svn-id: r44152
 2009-09-17 13:21:42 +00:00
Max Horn b2c386ed00 SCI: Move parts of struct ScriptState into a new struct DebugState 
svn-id: r44151
 2009-09-17 13:21:19 +00:00
Max Horn d861f5c854 SCI: cleanup 
svn-id: r44150
 2009-09-17 13:20:58 +00:00
Filippos Karapetis dce185ba8b Made script_lookup_export() a method of SegManager 
svn-id: r44140
 2009-09-17 09:36:52 +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 280bee663e SCI: Change SegmentId from int to uint16; consistently use segment 0 to indicate an invalid segment 
svn-id: r44131
 2009-09-17 00:46:01 +00:00
Max Horn 10f898c90e SCI: Rename MemObject -> SegmentObj 
svn-id: r44130
 2009-09-17 00:45:12 +00:00
Max Horn 1f0e8ef470 SCI: More cleanup 
svn-id: r44129
 2009-09-17 00:44:22 +00:00
Max Horn b26f744e23 SCI: cleanup 
svn-id: r44128
 2009-09-16 23:55:11 +00:00
Max Horn 68dfdce043 SCI: Turn some SegManager methods into Script methods 
svn-id: r44127
 2009-09-16 23:32:48 +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
Max Horn 8ac3db0801 SCI: Rename SegManager::kernelDeref*() methods to SegManager::deref*() 
svn-id: r44083
 2009-09-14 13:27:09 +00:00
Max Horn 0e834d0b87 SCI: kernelDeref*() functions are now seSegmentManager methods 
svn-id: r44082
 2009-09-14 13:13:20 +00:00
Max Horn c00edfb64f SCI: Merge kernelDerefCharPtr and kernelDerefString and change it from a macro to a function 
svn-id: r44081
 2009-09-14 12:59:42 +00:00
Filippos Karapetis 8bf80d9584 Always disable the "Change Directory" button in the save/load menus, as we don't allow the engine to change the directory where saved games will be placed 
svn-id: r44044
 2009-09-13 00:08:17 +00:00
Filippos Karapetis 18b24da384 Removed the INST_LOOKUP_CLASS define 
svn-id: r44043
 2009-09-12 18:22:32 +00:00
Filippos Karapetis 15cb36a7ee Made is_object() a method of the segment manager 
svn-id: r44042
 2009-09-12 17:42:04 +00:00
Filippos Karapetis 358b5649ce Removed the unused ASSERT()-related code and changed a warning where BREAKPOINT() was used to an error 
svn-id: r44041
 2009-09-12 17:31:29 +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
Filippos Karapetis 5cd538a1b3 Removed/replaced the gfx_pixmap_color struct 
svn-id: r44017
 2009-09-09 08:19:16 +00:00
Max Horn 37e51f1575 Fixed some (pedantic) warnings 
svn-id: r44015
 2009-09-08 22:03:07 +00:00
Filippos Karapetis e3a733f2e2 Fixed a regression from commit #43999 (segment ID 1 is valid) 
svn-id: r44000
 2009-09-07 08:27:49 +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 fdaa3d423c SCI: Script::obj_indices is now protected 
Add new methods init, allocateObject and getObject to class Script, and use them instead of directly accessing Script::obj_indices. Replace RAW_GET_CLASS_INDEX with Script::getObject()

svn-id: r43987
 2009-09-06 13:01:00 +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 029e3a5703 SCI: cleanup 
svn-id: r43984
 2009-09-06 12:59:34 +00:00
Max Horn b51e9988e6 SCI: cleanup 
svn-id: r43982
 2009-09-06 12:58:43 +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
Max Horn d04b5d2c9b SCI: Rename resManager -> resMan; segManager -> segMan 
svn-id: r43980
 2009-09-06 12:57:42 +00:00
Max Horn cd7a32eed0 SCI: Change script_lookup_export to use SegManager::validateExportFunc 
svn-id: r43978
 2009-09-06 12:56:28 +00:00