libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-12 19:58:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,913 Commits 6 Branches 5 Tags
Commit Graph

207 Commits

Author SHA1 Message Date
Filippos Karapetis
1faebccce2 Cleanup, remove unused/obsolete code 
svn-id: r50403
 2010-06-27 21:29:35 +00:00
Martin Kiewitz
4653153910 SCI: added new command "p" / "stepover" to execute one command, but skip send/calls processing. single-step is now "trace" (alias "s" and "t"), stepping till ret is "step_ret" (alias "pret"), removed unused kDebugSeek 
svn-id: r50388
 2010-06-27 19:58:32 +00:00
Max Horn
cfcbdf8656 SCI: Remove selector_name function, some cleanup 
svn-id: r49966
 2010-06-17 23:13:30 +00:00
Filippos Karapetis
93f33c7dab Resolved a FIXME with getSciLanguage(), by creating a separate setter. Also, some camelCase changes 
svn-id: r49568
 2010-06-10 11:18:10 +00:00
Filippos Karapetis
10aeb33a42 Merged restAdjust and restAdjustCur, as we don't save the restAdjust modifier inside saved games (rightfully so). Also, the segment manager is now reset inside the main loop, when the game is restarted, not in game_exit() 
svn-id: r49533
 2010-06-09 07:32:17 +00:00
Filippos Karapetis
2c950b321c Fixed regression from commit #49465 - there are in fact two restAdjust variables, the current and global one 
svn-id: r49486
 2010-06-07 15:14:58 +00:00
Filippos Karapetis
3c82b6578f Now that EngineState is not deleted when loading games, we can move some more state-related variables to it, and remove several FIXME's about non-const global variables. Also, the entries in the data stack are now deleted when loading (fixes a memory leak - thanks to digitall for this). 
svn-id: r49465
 2010-06-06 23:00:33 +00:00
Filippos Karapetis
c32e88fe0b Limit access to the _bufSize, _scriptSize and _heapSize members of the Script class 
svn-id: r49327
 2010-05-30 16:14:31 +00:00
Filippos Karapetis
67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name 
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
 2010-05-29 23:37:15 +00:00
Max Horn
0197e9f6a1 SCI: Making various object and script related things const 
svn-id: r49246
 2010-05-26 16:30:10 +00:00
Filippos Karapetis
1c0bbb10cb More work on controlling access to members of the Object class: 
- Moved the code for initializing the object class, species and base object inside the Object class
- Made propertyOffsetToId() a method of the Object class
- Made relocateObject() a method of the Object class
- The Object getVariable() method now returns a reference to the requested variable

Only SegManager::reconstructScripts() is left needing direct access to the members of the Object class

svn-id: r49228
 2010-05-26 08:27:24 +00:00
Filippos Karapetis
893af1600a Fixed signed/unsigned warning, changed to CamelCase 
svn-id: r49100
 2010-05-19 14:45:56 +00:00
Filippos Karapetis
f3892a506b - Removed the wrapper kalloc, kmem and kfree functions. Now, the associated Segment manager functions allocateHunkEntry, getHunkPointer and freeHunkEntry are used directly (which are more descriptive, anyway) 
- Replaced the GET_SEGMENT macro by a method of the segment manager
- Removed the unused reference to the created hunk in allocateHunkEntry(), only the reg_t reference to it is returned now

svn-id: r49078
 2010-05-18 13:05:09 +00:00
Filippos Karapetis
8b7c29a4ad Moved breakpointWasHit inside the DebugState struct, thus resolving a FIXME 
svn-id: r49071
 2010-05-18 09:18:27 +00:00
Matthew Hoops
3dda73d9a2 Add initial support for KQ6 Mac. Wrapper functions for read/writing to pointers are now used (found in util.*) for code that has different endianness in SCI1.1+ Mac games. Add support for Mac 'snd ' and 'CURS' resources. QFG1 Mac is not yet playable due to script compression. 
svn-id: r49070
 2010-05-18 04:17:58 +00:00
Max Horn
e45f0f309a SCI: Remove EngineState::_kernel, use SciEngine::_kernel instead 
svn-id: r48050
 2010-02-13 17:45:40 +00:00
Max Horn
4cfcf57546 SCI: Convert disassemble to use readPMachineInstruction. 
This change is untested, please check it. Also, the opparams
array is not used but could be used to simplify the reading code.

svn-id: r47958
 2010-02-07 12:14:49 +00:00
Max Horn
6c322506dd SCI: Move some code around (no code changes) 
svn-id: r47823
 2010-02-02 22:50:32 +00:00
Max Horn
b124a0c1cd SCI: Reduce header interdependencies a bit 
svn-id: r47666
 2010-01-29 11:05:06 +00:00
Walter van Niftrik
08bf02ccf2 SCI: Fixed debugger opcode names. 
svn-id: r45158
 2009-10-16 10:46:09 +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
Max Horn
6ad5840181 SCI: Rename EngineState::segMan to _segMan 
svn-id: r44629
 2009-10-04 18:38:18 +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
b2c386ed00 SCI: Move parts of struct ScriptState into a new struct DebugState 
svn-id: r44151
 2009-09-17 13:21:19 +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
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
d04b5d2c9b SCI: Rename resManager -> resMan; segManager -> segMan 
svn-id: r43980
 2009-09-06 12:57:42 +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
bc8770cafb Removed the "op_" prefix from opcode names in the script debugger 
svn-id: r43798
 2009-08-29 11:56:59 +00:00
Filippos Karapetis
faa3c64d1b Stop loading opcodes from vocab.998. They are the same in all SCI games and are hardcoded anyway (plus, vocab.998 is unreliable in some games, e.g. QFG3, or completely missing in others). Also hardcoded the opcode names for the script debugger, the only place they're actually used. The only place where vocab.998 is loaded on demand is when using the "opcodes" console command (for debug/verification purposes) 
svn-id: r43775
 2009-08-27 23:39:59 +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
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
353e9fb36a SCI: Turn off logging in debugger. 
svn-id: r43268
 2009-08-11 12:57:51 +00:00
Willem Jan Palenstijn
a1bb715611 SCI: Fix stepping in debugger 
svn-id: r42587
 2009-07-18 12:51:12 +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
763c6c8ca1 Fixed regression in the script parser from commit 42260 
svn-id: r42371
 2009-07-11 06:19:29 +00:00
Filippos Karapetis
62499054a0 Some cleanup for the script debugger code: 
- Renamed struct DebugState to ScriptState and r_amp_rest to restAdjust inside EngineState. Changed restAdjust to be a uint16 (actually it is a uint16, but it was being casted back and forth from an unsigned integer, so this clears up its type and size)
- Moved the script state variables from inside the run_vm() into the ScriptState struct, so that they can be accessed by the console commands and the script debugger all the time, and removed the weird isValid code

svn-id: r42260
 2009-07-08 10:25:37 +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
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls 
svn-id: r42167
 2009-07-06 10:39:22 +00:00
Max Horn
72512db7fb SCI: Fixed warning 
svn-id: r42055
 2009-07-03 10:41:03 +00:00
Filippos Karapetis
c3403ac739 Moved some more debug state related variables in the DebugState struct 
svn-id: r42044
 2009-07-02 23:58:05 +00:00
Filippos Karapetis
80cb18e87f Moved all the debug state variables in a separate struct and re-enabled several places where they're used 
svn-id: r42043
 2009-07-02 23:16:40 +00:00
Filippos Karapetis
245a2764fc Cleanup 
svn-id: r41727
 2009-06-21 13:06:08 +00:00
Filippos Karapetis
95d32180df Moved some more debug commands to ScummVM's console 
svn-id: r41364
 2009-06-08 08:38:10 +00:00
Filippos Karapetis
7375039158 Moved some more debug commands to ScummVM's coneole 
svn-id: r41302
 2009-06-06 20:29:37 +00:00
Filippos Karapetis
e572811aed Moved some more debug commands to ScummVM's coneole 
svn-id: r41227
 2009-06-06 16:43:13 +00:00