Max Horn
2e964baeef
Some const correctness changes; cleanup
...
svn-id: r44850
2009-10-09 21:47:33 +00:00
Max Horn
0988e273ec
SCI: Turn lookup_node & lookup_list into SegManager::lookupNode & SegManager::lookupList
...
svn-id: r44769
2009-10-07 23:34:24 +00:00
Max Horn
6ad5840181
SCI: Rename EngineState::segMan to _segMan
...
svn-id: r44629
2009-10-04 18:38:18 +00:00
Max Horn
01176782ea
Fix some cppcheck warnings reported by salty-horse
...
svn-id: r44538
2009-10-02 14:32:54 +00:00
Filippos Karapetis
86016e4dc5
Changed the list sanity checks to return warnings instead of errors in case of failure - apparently, this can occur in some games, e.g. Longbow and QFG1
...
svn-id: r44503
2009-09-30 22:54:00 +00:00
Filippos Karapetis
f9296a6445
- Changed the unimplemented debug SCI kernel functions (InspectObj, ShowSends, ShowObjs, ShowFree, StackUsage and Profiler) to be dummy functions - we have our own debugger, and don't use these functions for debugging
...
- Removed the function number parameter from all kernel functions, as it's no longer needed, and removed the FAKE_FUNCT_NR hack
- Removed kUnknown() and kStub()
- Dummy/unknown kernel functions are no longer invoked, and a warning is shown instead, with the paremeters passed to them
Note: there is an evil hack used for debugging scripts in invoke_selector(), which probably no longer works now
svn-id: r44461
2009-09-29 14:24:07 +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
10f898c90e
SCI: Rename MemObject -> SegmentObj
...
svn-id: r44130
2009-09-17 00:45:12 +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
Max Horn
6c44eafa97
SCI: funct_nr is not used in 99% of all opcodes -- hide it in those (to be removed eventually)
...
svn-id: r43905
2009-09-02 11:33:25 +00:00
Filippos Karapetis
ac025f4294
- Replaced more cases of EngineState parameters
...
- Made some version comparisons for old SCI0 versions easier to read
- Removed the GET_SEL32SV macro
svn-id: r43729
2009-08-25 15:14:29 +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
Joost Peters
6a3c595b01
remove \n's from error() calls
...
svn-id: r43571
2009-08-20 21:03:03 +00:00
Max Horn
f08f5c3bbf
SCI: Slightly modified kAddAfter so that it does not modify its arguments needlessly
...
svn-id: r41174
2009-06-04 20:51:24 +00:00
Filippos Karapetis
780926991e
Moved some more console commands to ScummVM's debug console
...
svn-id: r41126
2009-06-02 19:03:43 +00:00
Filippos Karapetis
c730e0290d
Replaced kernel_oops with error(), and added an enum to clarify the cases where invoke_selector should stop
...
svn-id: r41095
2009-06-01 08:00:58 +00:00
Filippos Karapetis
e55388c787
Removed script_error_flag and script_debug_flag, which were used to error out if something went wrong and open the debugger console. Changed all the places where they were used to error() out instead, as ScummVM's debugger console can open on error()
...
svn-id: r41073
2009-05-31 15:34:23 +00:00
Torbjörn Andersson
0999534749
The error() and warning() functions add ! and newline automatically. (I didn't
...
look at debug() and debugC(), since I'm really bored with this now. :-)
svn-id: r41061
2009-05-31 10:02:16 +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
Filippos Karapetis
4799cbf1c3
Removed the PREG, PSTK, IS_NULL_REG and REG_EQ defines
...
svn-id: r40767
2009-05-21 17:18:46 +00:00
Max Horn
790e235ae1
SCI: Removed ENTRY_IS_VALID macro
...
svn-id: r40690
2009-05-18 15:07:31 +00:00
Johannes Schickel
3406790cc3
Don't print __FILE__,__LINE__ in *_list related debug output, it would only print klists.cpp and the according line anyway.
...
svn-id: r40681
2009-05-18 11:56:00 +00:00
Johannes Schickel
220fe60424
Fix some error/warning calls. (might need some review, from someone familiar with SCI)
...
svn-id: r40680
2009-05-18 11:53:04 +00:00
Filippos Karapetis
1e547f320c
Removed the unused file and line parameters from the list and list node lookup functions, and removed the LOOKUP_LIST and LOOKUP_NODE defines. Also, disabled the unused LOOKUP_SPECIES define
...
svn-id: r40676
2009-05-18 08:28:04 +00:00
Filippos Karapetis
1239949ef2
Changed errors to be fatal, as most of them are fatal conditions. Some of them have been changed to warnings for now, as they occur in certain games (e.g. SQ4 floppy, SQ4 CD and KQ5 CD)
...
svn-id: r40675
2009-05-18 07:55:13 +00:00
Max Horn
1949133d22
SCI: Simplified the Table class, by making it use an Common::Array internally. Increased savegame version, breaking compatibility to the previous one -- sorry for that, but some of my previous changes accidentally messed up the table syncing, resulting in messed up savegames anyway; these breakages should be fixed with this commit
...
svn-id: r40453
2009-05-11 13:32:00 +00:00
Max Horn
5e955ea045
SCI: Continue transition from MemObject to MemObjectNEW
...
svn-id: r40274
2009-05-03 11:07:07 +00:00
Max Horn
50c8821072
SCI: Renamed MemObject::type and ::segmgr_id to _type resp. _segmgrId, and added accessor methods getType() and getSegMgrId()
...
svn-id: r40271
2009-05-03 09:30:33 +00:00
Max Horn
ed914d6740
SCI: Improved the Table template a bit by taking advantage of C++ features
...
svn-id: r40190
2009-04-28 22:56:44 +00:00
Max Horn
6a2efdd36d
SCI: cleanup
...
svn-id: r39353
2009-03-12 03:26:58 +00:00
Max Horn
642bad22d8
SCI: Removed most uses of the 'inline' keyword. It is usually better to let the compiler figure out what to inline. As it is, most of these looked as if they were randomly placed ;)
...
svn-id: r39352
2009-03-12 03:26:47 +00:00
Filippos Karapetis
26135a175c
Changed a case inside inline_lookup_node() to non-fatal, for now, to make it possible to walk around in SQ4 (check the FIXME comment)
...
svn-id: r39348
2009-03-11 23:47:00 +00:00
Jordi Vilalta Prat
501e4bb91a
SCI: Renamed some kernel types and general cleanup
...
svn-id: r38961
2009-02-28 11:12:59 +00:00
Max Horn
479751104f
SCI: Renamed include/engine.h to engine/state.h; added a corresponding .cpp file with the EngineState constructor
...
svn-id: r38921
2009-02-27 02:23:40 +00:00
Max Horn
b5df97ad2b
SCI: Moved kernel.h and kdebug.h from include/ to engine/; untangled header deps some more
...
svn-id: r38833
2009-02-24 05:51:55 +00:00
Jordi Vilalta Prat
817fde6cdd
SCI: Convert the segment manager into a class
...
svn-id: r38767
2009-02-21 23:27:24 +00:00
Max Horn
8430b662a9
SCI: Changed typedef struct -> struct
...
svn-id: r38752
2009-02-21 22:06:42 +00:00
Willem Jan Palenstijn
34f90ac043
revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
...
svn-id: r38696
2009-02-21 14:11:41 +00:00
Travis Howell
7ce7993c30
Remove excess \n.
...
svn-id: r38695
2009-02-21 13:19:44 +00:00
Jordi Vilalta Prat
3cc6cdf719
Replaced "typedef struct _state state_t" with "struct EngineState"
...
svn-id: r38678
2009-02-21 10:47:56 +00:00
Oystein Eftevaag
25f7c37171
Wrapped the SCI engine in the Sci namespace.
...
svn-id: r38676
2009-02-21 10:23:36 +00:00
Max Horn
fa75bd23e6
SCI: Yet more cleanup
...
svn-id: r38661
2009-02-21 04:43:49 +00:00
Max Horn
031e3e3b90
SCI: Fixed tons of bugs in error/warning format strings
...
svn-id: r38655
2009-02-21 03:25:23 +00:00
Filippos Karapetis
2ddce51a56
Changed more messages to warnings/errors
...
svn-id: r38621
2009-02-20 20:39:02 +00:00
Filippos Karapetis
ac716ad843
Started conversion of debug messages and debug levels to the ScummVM equivalents. Removed the "stubs" and "warnings" debug levels and replaced such kinds of messages with normal warnings
...
svn-id: r38617
2009-02-20 20:11:12 +00:00
Paweł Kołodziejski
5066e2c4be
formating
...
svn-id: r38598
2009-02-20 16:18:08 +00:00
Eugene Sandulenko
22a009d3c6
Update headers. engine/
...
svn-id: r38408
2009-02-17 15:02:16 +00:00
Max Horn
57434d955f
SCI: Run astyle to make the code be more compliant with our Code Formatting Guidelines: engine dir
...
svn-id: r38317
2009-02-15 22:28:12 +00:00