From ea5bf444d3654fcdcd649456ee5d63bb4deaa72a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 21 Nov 2009 22:15:20 +0000
Subject: Fix mismatching resource type IDs for Lands of Lore in kyra.dat.

svn-id: r46051
---
 dists/engine-data/kyra.dat              | Bin 331978 -> 331978 bytes
 engines/kyra/staticres.cpp              |   2 +-
 tools/create_kyradat/create_kyradat.cpp |   2 +-
 tools/create_kyradat/extract.cpp        |  14 +++++++-------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat
index bb55fa9fab..0574553fd4 100644
Binary files a/dists/engine-data/kyra.dat and b/dists/engine-data/kyra.dat differ
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index f82a5ade32..9a693533be 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -45,7 +45,7 @@
 
 namespace Kyra {
 
-#define RESFILE_VERSION 67
+#define RESFILE_VERSION 68
 
 namespace {
 bool checkKyraDat(Common::SeekableReadStream *file) {
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 27c751eb0e..129d532972 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -42,7 +42,7 @@
 #include <map>
 
 enum {
-	kKyraDatVersion = 67
+	kKyraDatVersion = 68
 };
 
 const ExtractFilename extractFilenames[] = {
diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp
index 2f3c7f9bca..4a6055d498 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/tools/create_kyradat/extract.cpp
@@ -99,13 +99,13 @@ const TypeTable typeTable[] = {
 	{ k2TypeSfxList, 0 },
 	{ k3TypeRaw16to8, 1 },
 	{ k3TypeShpData, 7 },
-	{ kLolTypeRaw16, 15 },
-	{ kLolTypeRaw32, 16 },
-	{ kLolTypeButtonDef, 14 },
-	{ kLolTypeCharData, 10 },
-	{ kLolTypeSpellData, 11 },
-	{ kLolTypeCompassData, 12 },
-	{ kLolTypeFlightShpData, 13 },
+	{ kLolTypeRaw16, 13 },
+	{ kLolTypeRaw32, 14 },
+	{ kLolTypeButtonDef, 12 },
+	{ kLolTypeCharData, 8 },
+	{ kLolTypeSpellData, 9 },
+	{ kLolTypeCompassData, 10 },
+	{ kLolTypeFlightShpData, 11 },
 	{ -1, 0 }
 };
 
-- 
cgit v1.2.3