diff stru6.h @ 486:7887a9cf9e7b

Spells
author Nomad
date Wed, 27 Feb 2013 17:29:05 +0200
parents 8b8fd4d83fdc
children e01730a207c3
line wrap: on
line diff
--- a/stru6.h	Wed Feb 27 02:26:16 2013 +0400
+++ b/stru6.h	Wed Feb 27 17:29:05 2013 +0200
@@ -51,12 +51,15 @@
 #pragma pack(push, 1)
 struct PlayerBuffAnim
 {
+  inline PlayerBuffAnim():
+    bRender(false), uSpellAnimTime(0), uSpellIconID(0)
+  {}
+
   __int16 bRender;
   __int16 field_2;
+  int field_4;
+  int uSpellAnimTime;
   int uSpellIconID;
-  __int16 uSpellID;
-  __int16 field_A;
-  int uSpellIconID_;
 };
 #pragma pack(pop)
 
@@ -80,10 +83,11 @@
 #pragma pack(push, 1)
 struct stru6_stru2
 {
-  int uSpellAnimLength;
-  float flt_4;
-  float flt_8;
-  float flt_C;
+  //int field_0;
+  float flt_0_x;
+  float flt_4_y;
+  float flt_8_z;
+  int   field_C;
 };
 #pragma pack(pop)
 
@@ -96,14 +100,10 @@
   //----- (004A7155) --------------------------------------------------------
   stru6()
   {
-    this->pPlayerBuffs[0].bRender = 0;
-    this->pPlayerBuffs[1].bRender = 0;
-    this->pPlayerBuffs[2].bRender = 0;
-    this->pPlayerBuffs[3].bRender = 0;
     this->field_204 = 0;
     this->uFadeTime = 0;
     this->uNumProjectiles = 0;
-    this->array_0[0].uSpellAnimLength = 0;
+    this->field_0 = 0;
 
     pStru1 = new stru6_stru1_indoor_sw_billboard;
     pStru1->Initialize(0xFF3C1Eu);
@@ -133,7 +133,7 @@
   int _4A806F(struct Actor *pActor);
   void _4A80DC_some_stuff_sw(struct LayingItem *a2);
   bool _4A81CA(struct LayingItem *a2);
-  int SetPlayerBuffAnim(unsigned __int16 uSpellID, unsigned __int16 uPlayerID);
+  void SetPlayerBuffAnim(unsigned __int16 uSpellID, unsigned __int16 uPlayerID);
   void FadeScreen__like_Turn_Undead_and_mb_Armageddon(unsigned int uDiffuseColor, unsigned int uFadeTime);
   int _4A8BFC();
   void RenderSpecialEffects();
@@ -141,7 +141,11 @@
   void LoadAnimations();
 
 
-  stru6_stru2 array_0[32];
+  int field_0;
+  stru6_stru2 array_4[31];
+  int field_1F4;
+  int field_1F8;
+  int field_1FC;
   int field_200;
   int field_204;
   PlayerBuffAnim pPlayerBuffs[4];