From 60f7737272603d3d5213bf040fd121f6a473438c Mon Sep 17 00:00:00 2001
From: kaelima <kaelima@live.se>
Date: Wed, 14 Sep 2011 15:02:12 +0200
Subject: Core/DataStore: Add struct for LiquidTypeEntry.dbc, unused for now.

---
 src/server/game/DataStores/DBCStores.cpp           |  2 +-
 src/server/game/DataStores/DBCStores.h             |  1 +
 src/server/game/DataStores/DBCStructure.h          | 22 ++++++++++++++++++++++
 src/server/game/DataStores/DBCfmt.h                |  1 +
 .../scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp |  2 +-
 5 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp
index fc709599da5..85af0f6c1e2 100755
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@@ -118,7 +118,7 @@ DBCStorage <ItemRandomSuffixEntry> sItemRandomSuffixStore(ItemRandomSuffixfmt);
 DBCStorage <ItemSetEntry> sItemSetStore(ItemSetEntryfmt);
 
 DBCStorage <LFGDungeonEntry> sLFGDungeonStore(LFGDungeonEntryfmt);
-
+//DBCStorage <LiquidTypeEntry> sLiquidTypeStore(LiquidTypeEntryfmt);
 DBCStorage <LockEntry> sLockStore(LockEntryfmt);
 
 DBCStorage <MailTemplateEntry> sMailTemplateStore(MailTemplateEntryfmt);
diff --git a/src/server/game/DataStores/DBCStores.h b/src/server/game/DataStores/DBCStores.h
index 713bf5cf65c..367746616d1 100755
--- a/src/server/game/DataStores/DBCStores.h
+++ b/src/server/game/DataStores/DBCStores.h
@@ -118,6 +118,7 @@ extern DBCStorage <ItemRandomPropertiesEntry>    sItemRandomPropertiesStore;
 extern DBCStorage <ItemRandomSuffixEntry>        sItemRandomSuffixStore;
 extern DBCStorage <ItemSetEntry>                 sItemSetStore;
 extern DBCStorage <LFGDungeonEntry>              sLFGDungeonStore;
+//extern DBCStorage <LiquidTypeEntry>              sLiquidTypeStore;
 extern DBCStorage <LockEntry>                    sLockStore;
 extern DBCStorage <MailTemplateEntry>            sMailTemplateStore;
 extern DBCStorage <MapEntry>                     sMapStore;
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index a45bafe8a2e..ff91964230a 100755
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1186,6 +1186,28 @@ struct LFGDungeonEntry
     uint32 Entry() const { return ID + (type << 24); }
 };
 
+/*
+struct LiquidTypeEntry
+{
+    uint32      ID;                                         // 0
+    char*       name;                                       // 1
+    uint32      flags;                                      // 2        Water: 1|2|4|8, Magma: 8|16|32|64, Slime: 2|64|256, WMO Ocean: 1|2|4|8|512
+    uint32      type;                                       // 3        0: Water, 1: Ocean, 2: Magma, 3: Slime
+    uint32      soundid;                                    // 4        Reference to SoundEntries.dbc
+    uint32      spellID;                                    // 5        Reference to Spell.dbc
+    float       unk0[4];                                    // 6-9
+    uint32      unk1;                                       // 10       Light?
+    float       particleScale                               // 11       0: Slime, 1: Water/Ocean, 4: Magma
+    uint32      particleMovement;                           // 12
+    uint32      unk2                                        // 13
+    uint32      LiquidMaterialID                            // 14       Reference to LiquidMaterial.dbc
+    char*       texture[6];                                 // 15-20
+    uint32      unk3[2]                                     // 21-22
+    float       unk4[18];                                   // 23-40
+    uint32      unk5[4]                                     // 41-44
+};
+*/
+
 #define MAX_LOCK_CASE 8
 
 struct LockEntry
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 0728a2f838e..5d33a3011ab 100755
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -77,6 +77,7 @@ const char ItemRandomPropertiesfmt[]="nxiiixxssssssssssssssssx";
 const char ItemRandomSuffixfmt[]="nssssssssssssssssxxiiixxiiixx";
 const char ItemSetEntryfmt[]="dssssssssssssssssxiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii";
 const char LFGDungeonEntryfmt[]="nxxxxxxxxxxxxxxxxxiiiiiiixixxixixxxxxxxxxxxxxxxxx";
+//const char LiquidTypeEntryfmt[]="nsiiiiffffifiiisssssiiffffffffffffffffffiiii";
 const char LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
 const char MailTemplateEntryfmt[]="nxxxxxxxxxxxxxxxxxssssssssssssssssx";
 const char MapEntryfmt[]="nxixxssssssssssssssssxixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxixiffxiix";
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
index 3c8b62bf64a..a6f67c6f970 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp
@@ -900,7 +900,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader
             {
                 if (Unit* caster = GetCaster())
                 {
-                    if (InstanceScript* instance = GetCaster()->GetInstanceScript())
+                    if (InstanceScript* instance = caster->GetInstanceScript())
                     {
                         if (Unit* toyPile = ObjectAccessor::GetUnit(*caster, instance->GetData64(DATA_TOY_PILE_0 + urand(0, 3))))
                         {
-- 
cgit v1.2.3