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
a277123f54
SCI: Rename Script class members, change Script from struct to class
...
svn-id: r44126
2009-09-16 23:32:27 +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
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
Filippos Karapetis
1bbab8f191
Some renaming:
...
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan
svn-id: r43908
2009-09-02 12:02:37 +00:00
Max Horn
b391f08b46
SCI: Renamed kernel_dereference_* to kernelDeref*, and added kernelDerefString
...
svn-id: r43907
2009-09-02 11:38:16 +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
Walter van Niftrik
dd9e569325
SCI: Improved multilanguage support for SCI1 and SCI1.1.
...
svn-id: r43217
2009-08-10 18:37:47 +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
522b161bec
Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls
...
svn-id: r42167
2009-07-06 10:39:22 +00:00
Walter van Niftrik
a6ed05740f
SCI: Moved resource36 handling into resource manager.
...
svn-id: r41349
2009-06-07 19:15:55 +00:00
Filippos Karapetis
744323ca33
Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers
...
svn-id: r41338
2009-06-07 15:53:30 +00:00
Walter van Niftrik
9e196ce9f5
SCI: Message: Added support for escape sequences.
...
svn-id: r41169
2009-06-04 14:29:20 +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
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
Max Horn
cf68dc1a7b
SCI: Renamed some Vocabulary methods for clarity; also renamed decypherSaidBlock -> decipherSaidBlock; some cleanup in Console::cmdSentenceFragments
...
svn-id: r41072
2009-05-31 15:08:47 +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
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
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
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
Walter van Niftrik
fd191a4920
SCI: Changed signatures of StrLen and StrCpy to allow NULL pointers. This is
...
needed for a game bug in KQ6CD.
svn-id: r40930
2009-05-26 23:34:57 +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
7d5f3e1714
Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
...
svn-id: r40908
2009-05-26 11:30:21 +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
Walter van Niftrik
df3357159c
SCI: Added some stubs for LSL6CD (lores).
...
svn-id: r40719
2009-05-19 02:10:58 +00:00
Max Horn
e0366f00bc
SCI: Removed SCI_SIMPLE_SAID_CODE and the associated heavily bitrotted code
...
svn-id: r40691
2009-05-18 15:07:51 +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
Filippos Karapetis
87e8f94fde
- Moved all the files out of /sci/scicore and into /sci
...
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp
svn-id: r40608
2009-05-15 14:07:45 +00:00
Max Horn
9c44705f05
SCI: Got rid of SEG_ID/SCRIPT_ID
...
svn-id: r40599
2009-05-15 09:28:31 +00:00
Max Horn
75c0d719c9
SCI: Turned several script related SegManager methods into Script methods
...
svn-id: r40597
2009-05-15 09:27:07 +00:00
Max Horn
a3efc5611c
Fixed various GCC 4.2 warnings, among them an actual longstanding bug (3 years :) in the quicktime midi code
...
svn-id: r40577
2009-05-14 23:09:04 +00:00
Walter van Niftrik
f64df361e0
SCI: Message: fix K_MESSAGE_SIZE
...
svn-id: r40556
2009-05-14 11:27:54 +00:00
Walter van Niftrik
e35b77e0a7
SCI: Message: Added a few more subfunctions; cleanup.
...
svn-id: r40529
2009-05-13 19:03:12 +00:00
Max Horn
0255cd0213
SCI: Removed sci_memory.h/.cpp
...
svn-id: r40514
2009-05-12 23:30:10 +00:00
Walter van Niftrik
c299dbeb26
SCI: Merged Message() and GetMessage(). Set SCI1.1 to use SCI1 kernel table (for now).
...
svn-id: r40481
2009-05-12 12:31:09 +00:00
Walter van Niftrik
7f587a9d6b
SCI: Message: Added resource-internal recursion (currently untested).
...
svn-id: r40478
2009-05-12 11:28:15 +00:00
Walter van Niftrik
4d55f8b8d7
SCI: Minor changes to Message(). Some of the text in KQ6 floppy should now be visible.
...
svn-id: r40441
2009-05-10 22:25:43 +00:00
Filippos Karapetis
7cd07d9581
Cleanup
...
svn-id: r40423
2009-05-10 14:57:27 +00:00
Filippos Karapetis
53f24f3e43
Applied patch by waltervn to remove the length parameter from getText() and fixed a silly bug in getLength()
...
svn-id: r40421
2009-05-10 13:47:38 +00:00
Filippos Karapetis
3592801a57
Objectified and cleaned up the MessageState class
...
svn-id: r40419
2009-05-10 13:15:14 +00:00