From f173041811398817ffce870d30ef3b87d1302736 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 20 Apr 2008 15:47:11 +0000 Subject: - moved kyra functor code to common/func.h - adapted debugger code to use functor code from common/func.h - adapted kyra engine to use functor code from common/func.h svn-id: r31614 --- engines/kyra/script.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'engines/kyra/script.h') diff --git a/engines/kyra/script.h b/engines/kyra/script.h index 4ea05ea158..bc92aebc5e 100644 --- a/engines/kyra/script.h +++ b/engines/kyra/script.h @@ -26,13 +26,14 @@ #ifndef KYRA_SCRIPT_H #define KYRA_SCRIPT_H -#include "kyra/kyra.h" -#include "kyra/util.h" - #include "common/stream.h" +#include "common/func.h" namespace Kyra { +struct ScriptState; +typedef Common::Functor1 Opcode; + struct ScriptData { byte *text; uint16 *data; @@ -61,6 +62,9 @@ struct ScriptState { #define ORDR_CHUNK 0x5244524F #define AVTL_CHUNK 0x4C545641 +class Resource; +class KyraEngine; + class ScriptFileParser { public: ScriptFileParser() : _stream(0), _startOffset(0), _endOffset(0) {} -- cgit v1.2.3