Mercurial > mm7

diff Engine/Spells/Spells.h @ 2566:30eb6dcac768
big spell fx overhaul
author: a.parshin
date: Wed, 20 May 2015 21:05:07 +0200
parents: 68cdef6879a0
--- a/Engine/Spells/Spells.h	Wed May 20 15:12:33 2015 +0200
+++ b/Engine/Spells/Spells.h	Wed May 20 21:05:07 2015 +0200
@@ -2,11 +2,15 @@
 
 #include <array>
 
+#include "Engine/Objects/SpriteObject.h"
+
 #include "../VectorTypes.h"
 
 /*  360 */
 enum SPELL_TYPE
 {
+  SPELL_0 = 0,
+
   SPELL_FIRE_TORCH_LIGHT = 1,
   SPELL_FIRE_FIRE_BOLT = 2,
   SPELL_FIRE_PROTECTION_FROM_FIRE = 3,
@@ -208,9 +212,9 @@
 
 /*  364 */
 #pragma pack(push, 1)
-struct stru324_spell
+struct stru324_spell_id_to_sprite_mapping//stru324_spell
 {
-  __int16 uType;
+    SPRITE_OBJECT_TYPE uSpriteType;
   __int16 field_2;
 };
 #pragma pack(pop)
@@ -281,9 +285,9 @@
 
 extern std::array<std::array<struct SpellBookIconPos, 12>, 9> pIconPos;
 
-extern std::array<stru324_spell, 103> stru_4E3ACC;
+extern std::array<stru324_spell_id_to_sprite_mapping, 103> spell_sprite_mapping; // 4E3ACC
 extern std::array<SpellData, 100> pSpellDatas;
-extern std::array<unsigned int, 25> wand_spell_ids;
+extern std::array<SPELL_TYPE, 25> wand_spell_ids;
 
 int _43AFE3_calc_spell_damage(int spellId, int spellLevel, signed int skillMastery, int currentHp);