aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/vocabulary.cpp
AgeCommit message (Collapse)Author
2009-10-19SCI: Cleanup the grammar/vocab code: Move defs from vocabulary.h to ↵Max Horn
grammar.cpp where possible, turn comments into doxygen format etc. svn-id: r45253
2009-09-30- Moved the list of synonyms and parser nodes inside the vocabulary classFilippos Karapetis
- Added a convenience member inside the EngineState struct to access the instance of the Vocabulary class svn-id: r44481
2009-09-23- Moved the SCI version in a global variableFilippos Karapetis
- Changed all the SCI version checks to use getSciVersion() - Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine) The fallback detector should work correctly now svn-id: r44269
2009-09-22SCI: Add some FIXMEs, and print warning if accessing a raw segment as ↵Max Horn
non-raw or vice versa svn-id: r44245
2009-09-17SCI: Moved Kernel::findSelector from vocabulary.cpp to engine/kernel.cppMax Horn
svn-id: r44161
2009-09-17SCI: Removed dead codeMax Horn
svn-id: r44159
2009-09-02Some renaming:Filippos Karapetis
getresourceManager -> getResourceManger resourceManager -> resMan segmentManager ->segMan svn-id: r43908
2009-08-27Stop loading opcodes from vocab.998. They are the same in all SCI games and ↵Filippos Karapetis
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-25- Simplified the parameters of some functionsFilippos Karapetis
- 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-16SCI: Stage 1 of the game detection overhaul. The end goal is to autodetectWalter van Niftrik
as much as possible. All SCI_VERSION_* information was removed from detection.cpp (much of it was incorrect anyway). svn-id: r43449
2009-08-15SCI: Added enum for map and volume versions. Removed res_version setting fromWalter van Niftrik
detection.cpp (should be detectable). Cleanup. svn-id: r43390
2009-07-07- Added auto-detection for EGA graphics. As a result of this, GF_SCI1_EGA ↵Filippos Karapetis
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-06Added seChanged the warning displayed when a selector can't be mapped to a ↵Filippos Karapetis
debugC - it's perfectly normal not to find certain selectors in certain SCI versions. Also, fixed the SCI version enums svn-id: r42169
2009-07-06Replaced sciprintf() calls with printf, DebugPrintf, warning and error callsFilippos Karapetis
svn-id: r42167
2009-07-03- Pushed debugstate into debug.hFilippos Karapetis
- When an error occurs, manipulate the execution stack before error() opens the console inside getDebugger(), like FreeSCI did. Added another method for obtaining the SCI console for use by the engine itself. svn-id: r42062
2009-06-07SCI: Moved resource36 handling into resource manager.Walter van Niftrik
svn-id: r41349
2009-06-07SCI: Resmgr cleanup and preparations for moving resource36 handling into resmgr.Walter van Niftrik
svn-id: r41318
2009-06-06Moved some more debug commands to ScummVM's coneoleFilippos Karapetis
svn-id: r41227
2009-06-04SCI: Made some members of class Resource protected; some cleanupMax Horn
svn-id: r41180
2009-06-04SCI: cleanupMax Horn
svn-id: r41165
2009-06-03- Moved the engine state and the console to be private members of SciEngineFilippos Karapetis
- Implemented pauseEngineIntern() - Music now stops and resumes when entering/leaving the debugger svn-id: r41139
2009-06-01Split the kernel functions away from the vocabulary functions (WIP, ↵Filippos Karapetis
saving/loading is broken) svn-id: r41101
2009-05-31SCI: Renamed some Vocabulary methods for clarity; also renamed ↵Max Horn
decypherSaidBlock -> decipherSaidBlock; some cleanup in Console::cmdSentenceFragments svn-id: r41072
2009-05-31SCI: Fixed loading; added 'const' keywords to several Vocabulary methodsMax Horn
svn-id: r41071
2009-05-31- Further objectification of the SCI vocabulary functionsFilippos Karapetis
- 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-31Further objectification of the SCI vocabulary functions. Removed the ↵Filippos Karapetis
"kernel_words" console command, as it's exactly the same as "parser_words" svn-id: r41065
2009-05-31The error() and warning() functions add ! and newline automatically. (I didn'tTorbjörn Andersson
look at debug() and debugC(), since I'm really bored with this now. :-) svn-id: r41061
2009-05-31More objectification of the Vocabulary functionsFilippos Karapetis
svn-id: r41057
2009-05-30Started objectifying the vocabulary functions (WIP)Filippos Karapetis
svn-id: r41051
2009-05-30SCI: Made vocab_version static again (a global static var is bad, but a ↵Max Horn
really global var is worse); also clarified some FIXME comments that we want to avoid *any* non-const global var, no matter whether it is static or not svn-id: r41045
2009-05-30Reverted the vocab loading function to be like it was before commit #40979 ↵Filippos Karapetis
(but without the static variable) svn-id: r41044
2009-05-30Swapped the checks for suffixes and branches to first check for SCI1 ↵Filippos Karapetis
resources, and then for SCI0 resources (as in SCI1 games, tree branches are in resource 901, which coincides with the SCI0 suffix vocabulary resource 901) svn-id: r41026
2009-05-30Fixed a silly typo in commit #40979. Suffixes should be loaded correctly againFilippos Karapetis
svn-id: r41018
2009-05-29SCI: Converted several fprintf(stderr) calls to warning/error (the remaining ↵Max Horn
fprintf calls should probably be replaced by suitable debug/debugC/debugN invocations) svn-id: r40993
2009-05-29- Fixed usage of kSetCursor in SCI1.1 games (e.g. when starting KQ6 floppy)Filippos Karapetis
- Removed a static variable (vocab_version) - vocab.996 is now freed after creating the class table in SCI1 games, like in SCI0 games svn-id: r40979
2009-05-28SCI: Turned vocab_version into a static var, and added several FIXMEs ↵Max Horn
related to it (either vocab_version needs to become a member of EngineState/SciEngine, or we need to derive its value e.g. from the game version/flags, if that's possible) svn-id: r40955
2009-05-27Added a fix to get QFG3 working and changed an error to a warning to get ↵Filippos Karapetis
EcoQuest 2 working svn-id: r40944
2009-05-26SCI: Added 'opcodes' command to the debugger; fixed output wrapping in the ↵Max Horn
selectors & kernelnames debugger commands svn-id: r40919
2009-05-26SCI: Merged vocab_debug.cpp into vocabulary.cpp; cleanupMax Horn
svn-id: r40915
2009-05-18SCI: Removed SCI_SIMPLE_SAID_CODE and the associated heavily bitrotted codeMax Horn
svn-id: r40691
2009-05-15- Moved all the files out of /sci/scicore and into /sciFilippos Karapetis
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp svn-id: r40608