KYRA: (EOB) - add some static res (flight object data) to kyra.dat

6 files changed, 24 insertions, 4 deletions

diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 97b871cb60..49f07acd5f 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -246,8 +246,6 @@ Common::Error EobCoreEngine::init() {
 	_screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT");
 
-	_activeButtons = 0;
-
 	_staticres = new StaticResource(this);
 	assert(_staticres);
 	if (!_staticres->init())
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index e88ab84d7a..e2873cbbcf 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -435,6 +435,13 @@ protected:
 	const int8 *_flightObjShpMap;
 	const int8 *_flightObjSclIndex;
 
+	const uint8 *_flightObjAnimTiles;
+	const uint8 *_flightObjAnimIndex;
+	const uint8 *_flightObjAnimDim;
+	const uint8 *_flightObjAnimTbl1;
+	const uint8 *_flightObjAnimTbl2;
+	const uint8 *_flightObjAnimTbl3;
+
 	// Monsters
 	void loadMonsterShapes(const char *filename, int monsterIndex, bool hasDecorations, int encodeTableIndex);
 	void releaseMonsterShapes(int first, int num);
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index ebe6ea6e19..7a4a3ec3e2 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -187,8 +187,6 @@ LoLEngine::LoLEngine(OSystem *system, const GameFlags &flags) : LolEobBaseEngine
 	_compassBroken = _drainMagic = 0;
 
 	_buttonData = 0;
-	_activeButtons = 0;
-	gui_resetButtonList();
 	_preserveEvents = false;
 	_buttonList1 = _buttonList2 = _buttonList3 = _buttonList4 = _buttonList5 = _buttonList6 = _buttonList7 = _buttonList8 = 0;
 
diff --git a/engines/kyra/loleobbase.cpp b/engines/kyra/loleobbase.cpp
index 1c4068de20..02ffbea803 100644
--- a/engines/kyra/loleobbase.cpp
+++ b/engines/kyra/loleobbase.cpp
@@ -36,6 +36,7 @@ LolEobBaseEngine::LolEobBaseEngine(OSystem *system, const GameFlags &flags) : Ky
 
 	_sceneXoffset = 0;
 	_sceneShpDim = 5;
+	
 	_activeButtons = 0;
 
 	_currentLevel = 0;
@@ -150,6 +151,8 @@ LolEobBaseEngine::~LolEobBaseEngine() {
 }
 
 Common::Error LolEobBaseEngine::init() {
+	gui_resetButtonList();
+
 	_levelDecorationProperties = new LevelDecorationProperty[100];
 	memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty));
 	_levelDecorationShapes = new uint8*[400];
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h
index 2c484b4d01..3e9ba09e69 100644
--- a/engines/kyra/resource.h
+++ b/engines/kyra/resource.h
@@ -396,6 +396,13 @@ enum KyraResources {
 	kEobBaseMagicStrings7,
 	kEobBaseMagicStrings8,
 
+	kEobBaseFlightObjAnimTiles,
+	kEobBaseFlightObjAnimIndex,
+	kEobBaseFlightObjAnimDim,
+	kEobBaseFlightObjAnimTbl1,
+	kEobBaseFlightObjAnimTbl2,
+	kEobBaseFlightObjAnimTbl3,
+
 	kEobBaseSparkDefSteps,
 	kEobBaseSparkDefSubSteps,
 	kEobBaseSparkDefShift,
diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp
index 557bacb239..e25508f459 100644
--- a/engines/kyra/staticres_eob.cpp
+++ b/engines/kyra/staticres_eob.cpp
@@ -459,6 +459,13 @@ void EobCoreEngine::initStaticResource() {
 	_magicStrings7 = _staticres->loadStrings(kEobBaseMagicStrings7, temp);
 	_magicStrings8 = _staticres->loadStrings(kEobBaseMagicStrings8, temp);
 
+	_flightObjAnimTiles = _staticres->loadRawData(kEobBaseFlightObjAnimTiles, temp);
+	_flightObjAnimIndex = _staticres->loadRawData(kEobBaseFlightObjAnimIndex, temp);
+	_flightObjAnimDim = _staticres->loadRawData(kEobBaseFlightObjAnimDim, temp);
+	_flightObjAnimTbl1 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl1, temp);
+	_flightObjAnimTbl2 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl2, temp);
+	_flightObjAnimTbl3 = _staticres->loadRawData(kEobBaseFlightObjAnimTbl3, temp);
+
 	_sparkEffectDefSteps = _staticres->loadRawData(kEobBaseSparkDefSteps, temp);
 	_sparkEffectDefSubSteps = _staticres->loadRawData(kEobBaseSparkDefSubSteps, temp);
 	_sparkEffectDefShift = _staticres->loadRawData(kEobBaseSparkDefShift, temp);