SCI: More rest of the workaround defs to workarounds.h

svn-id: r51090

1 files changed, 1 insertions, 26 deletions

diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index 8de95f56ef..8467a640af 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -40,6 +40,7 @@ namespace Sci {
 struct Node;	// from segment.h
 struct List;	// from segment.h
 struct SelectorCache;	// from selector.h
+struct SciWorkaroundEntry;	// from workarounds.h
 
 /**
  * @defgroup VocabularyResources	Vocabulary resources in SCI
@@ -120,32 +121,6 @@ enum {
 /* Generic description: */
 typedef reg_t KernelFunctionCall(EngineState *s, int argc, reg_t *argv);
 
-enum SciWorkaroundType {
-	WORKAROUND_NONE,      // only used by terminator or when no workaround was found
-	WORKAROUND_IGNORE,    // ignore kernel call
-	WORKAROUND_STILLCALL, // still do kernel call
-	WORKAROUND_FAKE       // fake kernel call / replace temp value / fake opcode
-};
-
-struct SciWorkaroundSolution {
-	SciWorkaroundType type;
-	uint16 value;
-};
-
-struct SciWorkaroundEntry {
-	SciGameId gameId;
-	int roomNr;
-	int scriptNr;
-	int16 inheritanceLevel;
-	const char *objectName;
-	const char *methodName;
-	int localCallOffset;
-	int index;
-	SciWorkaroundSolution newValue;
-};
-
-#define SCI_WORKAROUNDENTRY_TERMINATOR { (SciGameId)0, -1, -1, 0, NULL, NULL, -1, 0, { WORKAROUND_NONE, 0 } }
-
 struct KernelSubFunction {
 	KernelFunctionCall *function;
 	const char *name;