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
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
Filippos Karapetis 60af2db2fd - Added more mappings from Sierra's internal IDs to our own ones. Hopefully, all SCI0-SCI11 games can now be detected correctly from the fallback detector 
- Simplified some checks for old script types

svn-id: r43678
 2009-08-23 21:57:30 +00:00
Filippos Karapetis ca9bbce9b3 - Added game ID detection to the fallback detector. We still need to map some of Sierra's internal IDs to our own ones 
- The class table is now created in the segment manager constructor

svn-id: r43504
 2009-08-18 10:01:18 +00:00
Walter van Niftrik 260a2019b6 SCI: Add autodetection for DoSound. Cleanup. 
svn-id: r43482
 2009-08-17 15:49:22 +00:00
Filippos Karapetis c38f58598b - Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState 
- Moved the class table in the Segment manager - it's the only class using it directly
- Removed the sci11 flag from save games (we already know this, we don't need to store it)
- Moved script_get_segment() and get_class_address() inside the segment manager class
- Removed the script_locate_by_segment wrapper
- Simplified script_lookup_export() a lot by removing some paranoia checks
- Added some WIP code for automatically determining the game id in the fallback detector (still not working)
- General cleanup

svn-id: r43458
 2009-08-17 05:55:21 +00:00
Walter van Niftrik 00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect 
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
 2009-08-16 19:18:19 +00:00
Walter van Niftrik f99932b72a SCI: Added enum for map and volume versions. Removed res_version setting from 
detection.cpp (should be detectable). Cleanup.

svn-id: r43390
 2009-08-15 00:28:59 +00:00
Filippos Karapetis 31a0c80905 Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game) 
svn-id: r42398
 2009-07-11 23:45:54 +00:00
Filippos Karapetis d351c7b9cb Only the kernel needs to be initialized before anything else, when saving/loading 
svn-id: r42262
 2009-07-08 10:44:25 +00:00
Filippos Karapetis a764f274f8 Fixed saving/loading again (broken with the latest changes for game feature auto-detection) 
svn-id: r42261
 2009-07-08 10:35:51 +00:00
Filippos Karapetis d55f7e72d0 Added auto-detection for games with older headers for script blocks, and removed game flag GF_SCI0_OLD 
svn-id: r42211
 2009-07-07 10:28:05 +00:00
Filippos Karapetis c716e43a2b - Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA has been removed and versions SCI_VERSION_01_EGA and SCI_VERSION_01_VGA have been merged into SCI_VERSION_01 
- Simplified the checks for EGA and VGA graphics
- Fixed a bug in script_adjust_opcode_formats()
- Simplified the code in GfxResManager::getView() a bit

svn-id: r42206
 2009-07-07 07:44:25 +00:00
Filippos Karapetis 219b0de0d2 Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGA 
svn-id: r42181
 2009-07-06 16:22:14 +00:00
Filippos Karapetis 522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls 
svn-id: r42167
 2009-07-06 10:39:22 +00:00
Filippos Karapetis ed46e223eb Hopefully fixed memory corruption when loading games 
svn-id: r41361
 2009-06-07 23:29:11 +00:00
Walter van Niftrik a6ed05740f SCI: Moved resource36 handling into resource manager. 
svn-id: r41349
 2009-06-07 19:15:55 +00:00
Max Horn 21d948ec05 SCI: Simplified SongLibrary code a bit 
svn-id: r41345
 2009-06-07 17:07:25 +00:00
Max Horn d07e9dfb13 SCI: Objectified SongLibrary 
svn-id: r41343
 2009-06-07 17:06:51 +00:00
Max Horn f2ca788004 SCI: Renamed various song/songlib related structs and members 
svn-id: r41342
 2009-06-07 17:06:32 +00:00
Max Horn 10c54394bd SCI: Renamed EngineState::flags and version to _flags and _version (following our conventions); also slightly changed the EngineState constructor to init _version & _flags, and used this to make them constant 
svn-id: r41177
 2009-06-04 21:44:39 +00:00
Filippos Karapetis 98f64cfa2f Removed the gfxw_new_visual and gfxw_new_port wrappers, moved _kfuncTable inside the Kernel class and moved gfxw_find_port inside the GfxVisual struct 
svn-id: r41125
 2009-06-02 14:16:59 +00:00
Filippos Karapetis d405b2880b Removed some unused variables from the engine state 
svn-id: r41123
 2009-06-02 07:59:04 +00:00
Filippos Karapetis c85134bd5e Some fixes for saving/loading (still broken) 
svn-id: r41102
 2009-06-01 15:34:33 +00:00
Filippos Karapetis 99c6874630 Split the kernel functions away from the vocabulary functions (WIP, saving/loading is broken) 
svn-id: r41101
 2009-06-01 14:12:43 +00:00
Max Horn 4fba6e5d4c SCI: Fixed loading; added 'const' keywords to several Vocabulary methods 
svn-id: r41071
 2009-05-31 15:08:16 +00:00
Filippos Karapetis 4441ca4b3e - Further objectification of the SCI vocabulary functions 
- Rewrote the sci_opcodes enum so that it's easier to read
- Made the engine error out if data is sent to an invalid selector (which is a fatal condition)

svn-id: r41069
 2009-05-31 14:55:32 +00:00
Filippos Karapetis e317012cce Further objectification of the SCI vocabulary functions. Removed the "kernel_words" console command, as it's exactly the same as "parser_words" 
svn-id: r41065
 2009-05-31 12:05:49 +00:00
Filippos Karapetis a4d13cef8c More objectification of the Vocabulary functions 
svn-id: r41057
 2009-05-31 02:37:24 +00:00
Filippos Karapetis 76406c35ec Started objectifying the vocabulary functions (WIP) 
svn-id: r41051
 2009-05-30 22:15:00 +00:00
Filippos Karapetis 15d5b8436e Removed the "sfx_debuglog" command. Sound debug messages are now shown if kDebugLevelSound is specified 
svn-id: r41039
 2009-05-30 17:53:12 +00:00
Filippos Karapetis 3490819a66 - Removed debug_mode from the engine state 
- Turned all SCIkwarn and SCIkdebug functions to ScummVM's debugC function
- Placed some debug code in appropriate defines: DEBUG_PARSER, DEBUG_AVOIDPATH and DEBUG_SOUND
- Removed the "debuglog" command and the "script_checkloads_flag" and "sci_debug_flags" variables

svn-id: r41033
 2009-05-30 15:40:49 +00:00
Max Horn d3bd7b622c SCI: Turned SfxState into a proper class (i.e., convert the sfx_ funcs to member methods) 
svn-id: r40973
 2009-05-28 22:48:15 +00:00
Max Horn d70504c910 SCI: Renamed sfx_state_t -> SfxState, preparing it to become a class eventually 
svn-id: r40958
 2009-05-28 10:54:30 +00:00
Max Horn 7fbbaff990 SCI: Turned the global 'static MessageState state' variable into a member of EngineState 
svn-id: r40910
 2009-05-26 11:33:18 +00:00
Max Horn b431254070 SCI: Removed the 'save_dir' gui hack 
svn-id: r40772
 2009-05-21 21:50:11 +00:00