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.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 862ca2514e..ddc3f93cb7 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -38,11 +38,6 @@ namespace Sci {
struct Node; // from vm.h
struct List; // from vm.h
-extern int stop_on_event;
-
-extern int _debug_seeking;
-extern int _debug_step_running;
-
#define AVOIDPATH_DYNMEM_STRING "AvoidPath polyline"
//#define DEBUG_PARSER // enable for parser debugging
@@ -52,12 +47,12 @@ struct opcode {
};
/* Generic description: */
-typedef reg_t kfunct(EngineState *s, int funct_nr, int argc, reg_t *argv);
+typedef reg_t KernelFunc(EngineState *s, int funct_nr, int argc, reg_t *argv);
-struct kfunct_sig_pair_t {
- kfunct *fun; /* The actual function */
- const char *signature; /* kfunct signature */
- Common::String orig_name; /* Original name, in case we couldn't map it */
+struct KernelFuncWithSignature {
+ KernelFunc *fun; /**< The actual function */
+ const char *signature; /**< KernelFunc signature */
+ Common::String orig_name; /**< Original name, in case we couldn't map it */
};
class Kernel {
@@ -93,7 +88,7 @@ public:
void dumpScriptClass(char *data, int seeker, int objsize);
selector_map_t _selectorMap; /**< Shortcut list for important selectors */
- Common::Array<kfunct_sig_pair_t> _kfuncTable; /**< Table of kernel functions */
+ Common::Array<KernelFuncWithSignature> _kernelFuncs; /**< Table of kernel functions */
private:
/**