aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/engine/kernel.h')
-rw-r--r--engines/sci/engine/kernel.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index a85025f514..3ad54c9d48 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -68,7 +68,7 @@ public:
/**
* Initializes the SCI kernel
*/
- Kernel(ResourceManager *resmgr);
+ Kernel(ResourceManager *resourceManager);
~Kernel();
uint getOpcodesSize() const { return _opcodes.size(); }
@@ -95,16 +95,6 @@ public:
bool hasKernelFunction(const char *functionName) const;
/**
- * Applies to all versions before 0.000.395 (i.e. KQ4 old, XMAS 1988 and LSL2).
- * Old SCI versions used two word header for script blocks (first word equal
- * to 0x82, meaning of the second one unknown). New SCI versions used one
- * word header.
- * Also, old SCI versions assign 120 degrees to left & right, and 60 to up
- * and down. Later versions use an even 90 degree distribution.
- */
- bool hasOldScriptHeader() const { return (features & kFeatureOldScriptHeader); }
-
- /**
* Applies to all versions before 0.000.502
* Old SCI versions used to interpret the third DrawPic() parameter inversely,
* with the opposite default value (obviously).
@@ -177,7 +167,7 @@ private:
*/
bool loadOpcodes();
- ResourceManager *_resmgr;
+ ResourceManager *_resourceManager;
uint32 features;
// Kernel-related lists
@@ -256,7 +246,7 @@ char *kernel_lookup_text(EngineState *s, reg_t address, int index);
* @parm obj The address to check
* @return True if it is an object, false otherwise
*/
-bool is_object(EngineState *s, reg_t obj);
+bool is_object(SegManager *segManager, reg_t obj);
/******************** Kernel function parameter macros ********************/