aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sci.h
AgeCommit message (Collapse)Author
2009-10-09Removed the now unused GF_SCI0_OLDGETTIME flag and simplified all of the ↵Filippos Karapetis
game entries in the detector svn-id: r44856
2009-10-09Moved actor movement detection in state.cpp, together with the other ↵Filippos Karapetis
detections and rewrote it to work in a similar fashion to the other detections svn-id: r44836
2009-10-03SCI: Merge new GUI code written by m_kiewitz.Willem Jan Palenstijn
This is a major rewrite of the graphics code. A slightly adapted version of the old code is still available and currently the default. The new code is selectable in sci.cpp, but is not yet finished. svn-id: r44565
2009-09-23SCI: Rename _sciVersion to s_sciVersion and made it local to resource.cpp ↵Max Horn
(i.e. follow CFG and achieve code/data isolation) svn-id: r44271
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-17SCI: Add a global getSciVersion() function and make use of itMax Horn
svn-id: r44170
2009-09-06Removed some leftover debug code, and turned p0printf messages into debug ↵Filippos Karapetis
messages, introducing a new debug level svn-id: r43993
2009-09-02Some renaming:Filippos Karapetis
getresourceManager -> getResourceManger resourceManager -> resMan segmentManager ->segMan svn-id: r43908
2009-08-30SCI: CleanupWalter van Niftrik
svn-id: r43811
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: Rename sci_version_t to SciVersionWalter van Niftrik
svn-id: r43407
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-11Moved the kernel and the vocabulary outside of the engine state (they're ↵Filippos Karapetis
static data, which never changes during a game) svn-id: r42398
2009-07-07Added auto-detection for games with older headers for script blocks, and ↵Filippos Karapetis
removed game flag GF_SCI0_OLD svn-id: r42211
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-06Renamed SCI_VERSION_01 -> SCI_VERSION_01_EGAFilippos Karapetis
svn-id: r42181
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-05Merged the two SCI1 versions in one more fileFilippos Karapetis
svn-id: r42136
2009-07-05SCI1 games with absolute parameters to lofs instructions are automatically ↵Filippos Karapetis
detected now. Removed the GF_SCI1_LOFSABSOLUTE game flag svn-id: r42118
2009-07-04- Merged the "early" and "late" SCI1 versions - these are functionally ↵Filippos Karapetis
equivalent, and the code that does the version check is unreliable (e.g. it sets SQ1 VGA to SCI1 "late" and EcoQuest 1 to SCI1 "early") - Cleanup of the vocabulary setting functions - Cleanup of the cursor manipulation code svn-id: r42097
2009-07-04- Changed some comments to DOxygen styleFilippos Karapetis
svn-id: r42094
2009-07-04Removed silly FIXME (mixup between debug and engine debug levels)Filippos Karapetis
svn-id: r42088
2009-07-04Newer DoSound() semantics are now detected automatically, by the existence ↵Filippos Karapetis
of the "setVol" selector. Removed game flag GF_SCI1_NEWDOSOUND svn-id: r42087
2009-07-03SCI0 games using older graphics functions are automatically detected now, ↵Filippos Karapetis
from the presence of the "TimesSin" and "SinMult" kernel functions. Removed the GF_SCI0_OLDGFXFUNCS game flag svn-id: r42081
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-07-03Simplified the kernel name loading code: Merged the default SCI0 and SCI1 ↵Filippos Karapetis
kernel name tables in one table. vocab.999 is only used in SCI0 and SCI01 games if it exists as an override to the default kernel name table (which works with SCI0/SCI01 demos with no vocab.999, like KQ1 and xmas1998). Removed GF_SCI0_SCI1VOCAB. svn-id: r42050
2009-06-25After discussing with waltervn, committing my fix for the King's Quest I ↵Matthew Hoops
Demo (original from Patch #2795916). I'm also fixing the full game as well :) svn-id: r41841
2009-06-07SCI: Got rid of g_EngineStateMax Horn
svn-id: r41359
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-02Moved some more console commands to ScummVM's debug consoleFilippos Karapetis
svn-id: r41126
2009-05-30- Removed debug_mode from the engine stateFilippos Karapetis
- 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-29- Rewrote kSetCursor to be a bit simpler to understand, and got rid of ↵Filippos Karapetis
GF_SCI1_NEWSETCURSOR - Removed the 3 mouse pointer view, loop and cell variables (and their 3 "save" versions) from the game state, as they're all actually not used anywhere - Cleanup svn-id: r40976
2009-05-20removed trailing whitespacesMax Horn
svn-id: r40742
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
2009-05-15SCI: Keep a single copy of the versionNames array; this fixes warning about ↵Max Horn
it (well, one of its many copies) being unused svn-id: r40600
2009-05-15Simplified SCI versions to be SCI version generations, and fixed some game ↵Filippos Karapetis
entries in the process. Also, added a sanity check for invalid game entries svn-id: r40596
2009-05-14- Added a new game flag to distinguish SCI1 EGA versionsFilippos Karapetis
- Fixed the wrong detected versions of Laura Bow 2 - Changed some code regarding the resource loader of Jones in the Fast Lane (which is still non-functional) svn-id: r40564
2009-05-14Replaced the SCI_VERSION_FTU_DOSOUND_VARIANT_2 version check with the game ↵Filippos Karapetis
feature flag GF_SCI1_NEWDOSOUND svn-id: r40561
2009-05-14- Replaced SCI_VERSION_FTU_LOFS_ABSOLUTE with the GF_SCI1_LOFSABSOLUTE game flagFilippos Karapetis
- Moved the version defines outside of versions.h svn-id: r40559
2009-05-14SCI: Renamed GF_SCI0_BEFORE_* macros to GF_FOR_SCI0_BEFORE_* (to emphasise ↵Max Horn
that those are not Game Features); also moved their definitions into detection.cpp, to minimize the risk that they are accidentally used by other code svn-id: r40557
2009-05-14Added a feature flag for the SCI1.1 behavior of kSetCursor() in Eco 1 and ↵Filippos Karapetis
KQ5 CD. Some cleanup svn-id: r40554
2009-05-14- Removed SCI_VERSION_FTU_NEW_GETTIMEFilippos Karapetis
- Added defines for SCI0 flags, to simplify game entries - Removed the leftover version_lock_flag from EngineState svn-id: r40553
2009-05-14Started using game-specific flags and removed/replaced some SCI version ↵Filippos Karapetis
checks with flags. - The SCI0 new script header and the angles check have been replaced by the GF_SCI0_OLD flag - The SCI0 new drawpic parameter and the new priority check have been replaced by the GF_SCI0_OLDGFXFUNCS flag - Removed the code which retries to use the newer script header in SCI0 games if the detected one is wrong, as that case should be covered by the GF_SCI0_OLD flag - Removed the leftover min_version and max_version variables from gamestate - Cleaned up kGetTime() a bit svn-id: r40552
2009-05-14- Enabled the code which puts the text inside the screen if it doesn't fit ↵Filippos Karapetis
for all SCI versions - Removed the check for the mechanism to resume suspended songs (it's no longer used) svn-id: r40551
2009-05-14Removed the hack used to check for the existence of the CantBeHere() selectorFilippos Karapetis
svn-id: r40549
2009-05-13- Simplified SCI version detection a bit and clarified the different version ↵Filippos Karapetis
feature flags (not used yet) - Removed the version verification functions (they were only used for two specific cases, but the SCI executable reader is able to detect the exact SCI game version anyway, so there is no point in having these) - Removed the empty GameFlags structure and replaced it with a 32-bit integer instead svn-id: r40524
2009-05-12Rearranged all the different version checks based on SCI version in ↵Filippos Karapetis
versions.h, and added some WIP and unused game flags, which will hopefully replace the SCI version numbers svn-id: r40509
2009-05-11Console is a class, not a structFilippos Karapetis
svn-id: r40455