From d5545bd8c5589e8d919350b932eaed76b28e83e9 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 3 May 2008 19:23:45 +0000
Subject: - Moved newShape/temporaryScript code to KyraEngine_v2. - Renamed
 newShape/temporaryScript code to animationScript.

svn-id: r31841
---
 engines/kyra/kyra_hof.h | 51 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

(limited to 'engines/kyra/kyra_hof.h')

diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index f05ab77455..baecdc687a 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -204,9 +204,6 @@ public:
 	virtual TextDisplayer *text() { return _text; }
 	int language() const { return _lang; }
 protected:
-	// KyraEngine_v2 API
-	int getFirstSpecialSceneScript() const { return 8; }
-
 	// intro/outro
 	void seq_playSequences(int startSeq, int endSeq = -1);
 
@@ -322,9 +319,6 @@ protected:
 	void loadItemShapes();
 
 	// run
-	bool _runFlag;
-	bool _showCredits;
-
 	void update();
 	void updateWithText();
 
@@ -369,8 +363,6 @@ protected:
 
 	ShapeDesc *_shapeDescTable;
 
-	int getItemShape(int item) const { return 64+item; }
-
 	void loadCharacterShapes(int shapes);
 	void loadInventoryShapes();
 
@@ -385,19 +377,8 @@ protected:
 
 	int _layerFlagTable[16]; // seems to indicate layers where items get destroyed when dropped to (TODO: check this!)
 
-	char _newShapeFilename[13];
-	int _newShapeLastEntry;
-	int _newShapeWidth, _newShapeHeight;
-	int _newShapeXAdd, _newShapeYAdd;
-	int _newShapeFlag;
-	uint8 *_newShapeFiledata;
-	int _newShapeCount;
-	int _newShapeAnimFrame;
-	int _newShapeDelay;
-
-	int initNewShapes(uint8 *filedata);
-	void processNewShapes(int allowSkip, int resetChar);
-	void resetNewShapes(int count, uint8 *filedata);
+	int initAnimationShapes(uint8 *filedata);
+	void uninitAnimationShapes(int count, uint8 *filedata);
 
 	// animator
 	uint8 *_gamePlayBuffer;
@@ -581,7 +562,6 @@ protected:
 	static const char *_scriptLangExt[];
 
 	// character
-	int8 _deathHandler;
 	bool _useCharPal;
 	int _charPalEntry;
 	uint8 _charPalTable[16];
@@ -593,7 +573,7 @@ protected:
 
 	bool checkCharCollision(int x, int y);
 
-	static const int _characterFrameTable[];
+	static const uint8 _characterFrameTable[];
 
 	// text
 	void showMessageFromCCode(int id, int16 palIndex, int);
@@ -609,16 +589,7 @@ protected:
 	void fadeMessagePalette();
 
 	// chat
-	int _vocHigh;
-
-	const char *_chatText;
-	int _chatObject;
 	bool _chatIsNote;
-	uint32 _chatEndTime;
-	int _chatVocHigh, _chatVocLow;
-
-	EMCData _chatScriptData;
-	EMCState _chatScriptState;
 
 	int chatGetType(const char *text);
 	int chatCalcDuration(const char *text);
@@ -874,13 +845,8 @@ protected:
 	int o2_demoFinale(EMCState *script);
 	int o2_dummy(EMCState *script);
 
-	// opcodes temporary
-	// TODO: rename it from temporary to something more appropriate
-	int o2t_defineNewShapes(EMCState *script);
-	int o2t_setCurrentFrame(EMCState *script);
-	int o2t_playSoundEffect(EMCState *script);
-	int o2t_fadeScenePal(EMCState *script);
-	int o2t_setShapeFlag(EMCState *script);
+	// animation opcodes
+	int o2a_setCharacterFrame(EMCState *script);
 
 	// script
 	void runStartScript(int script, int unk1);
@@ -890,13 +856,6 @@ protected:
 
 	EMCData _npcScriptData;
 
-	EMCData _temporaryScriptData;
-	EMCState _temporaryScriptState;
-	bool _temporaryScriptExecBit;
-	Common::Array<const Opcode*> _opcodesTemporary;
-
-	void runTemporaryScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload);
-
 	// pathfinder
 	uint8 *_unkBuf500Bytes;
 	uint8 *_unkBuf200kByte;
-- 
cgit v1.2.3