LOL: - added some spell casting (spark, heal, swarm)

- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420

4 files changed, 9 insertions, 1 deletions

diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index d8876cde3c..50b294c6b8 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -31,7 +31,7 @@
 #include "md5.h"
 
 enum {
-	kKyraDatVersion = 45,
+	kKyraDatVersion = 46,
 	kIndexSize = 12
 };
 
@@ -341,6 +341,8 @@ const ExtractFilename extractFilenames[] = {
 	{ lolMapStringId, lolTypeRaw16, "MAPSTRID.LST" },
 	//{ lolMapPal, kTypeRawData, "MAP.PAL" },
 
+	{ lolSpellbookAnim, k3TypeRaw16to8, "MBOOKA.DEF" },
+	{ lolSpellbookCoords, k3TypeRaw16to8, "MBOOKC.DEF" },
 	{ lolHealShapeFrames, kTypeRawData, "MHEAL.SHP" },
 
 	{ -1, 0, 0 }
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index 9589340ebc..4c93cbd9e9 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -251,6 +251,8 @@ enum kExtractID {
 	lolMapStringId,
 	//lolMapPal,
 
+	lolSpellbookAnim,
+	lolSpellbookCoords,
 	lolHealShapeFrames,
 
 	kMaxResIDs
diff --git a/tools/create_kyradat/lol_cd.h b/tools/create_kyradat/lol_cd.h
index d05f74f05d..3c07777627 100644
--- a/tools/create_kyradat/lol_cd.h
+++ b/tools/create_kyradat/lol_cd.h
@@ -74,6 +74,8 @@ const ExtractEntry lolCDFile2[] = {
 	{ lolMapStringId, 0x000287D0, 0x0002880C },
 	//{ lolMapPal, 0x0001D9C0, 0x0001DBC0 },
 
+	{ lolSpellbookAnim, 0x00032D94, 0x00032DCC },
+	{ lolSpellbookCoords, 0x00032DCC, 0x00032DE4 },
 	{ lolHealShapeFrames, 0x000297D0, 0x00029820 },
 
 	{ -1, 0, 0 }
diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h
index c154d423e5..f868e7ce2e 100644
--- a/tools/create_kyradat/misc.h
+++ b/tools/create_kyradat/misc.h
@@ -557,6 +557,8 @@ const int lolCDFile2Need[] = {
 	lolMapStringId,
 	//lolMapPal,
 
+	lolSpellbookAnim,
+	lolSpellbookCoords,
 	lolHealShapeFrames,
 
 	-1