aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorfunjoker <torti-esser@web.de>2019-06-18 19:33:29 +0200
committerShauren <shauren.trinity@gmail.com>2019-06-18 19:33:29 +0200
commitd11b9a6992b9e46cc880f4c8b085479009acfaab (patch)
tree6671f66f462d468c071cd88fbc8299bbc8dd9f27 /src/server/game
parent357e0ec394af33b9764ff9ac6eb9b8f7c16dce97 (diff)
Core/DataStores: Fix field order for some DB2s (#23439)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/DataStores/DB2LoadInfo.h6
-rw-r--r--src/server/game/DataStores/DB2Structure.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index 02993db8522..0c4da4e2804 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -59,9 +59,9 @@ struct AnimationDataLoadInfo
static DB2FieldMeta const fields[] =
{
{ false, FT_INT, "ID" },
- { false, FT_SHORT, "Fallback" },
+ { false, FT_SHORT, "BehaviorID" },
{ false, FT_BYTE, "BehaviorTier" },
- { true, FT_INT, "BehaviorID" },
+ { true, FT_INT, "Fallback" },
{ true, FT_INT, "Flags1" },
{ true, FT_INT, "Flags2" },
};
@@ -4487,9 +4487,9 @@ struct SpellItemEnchantmentLoadInfo
{ false, FT_FLOAT, "EffectScalingPoints1" },
{ false, FT_FLOAT, "EffectScalingPoints2" },
{ false, FT_FLOAT, "EffectScalingPoints3" },
+ { false, FT_INT, "TransmogPlayerConditionID" },
{ false, FT_INT, "TransmogCost" },
{ false, FT_INT, "IconFileDataID" },
- { false, FT_INT, "TransmogPlayerConditionID" },
{ true, FT_SHORT, "EffectPointsMin1" },
{ true, FT_SHORT, "EffectPointsMin2" },
{ true, FT_SHORT, "EffectPointsMin3" },
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 314f7d98c89..9ad7b8ed1eb 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -49,9 +49,9 @@ struct AchievementEntry
struct AnimationDataEntry
{
uint32 ID;
- uint16 Fallback;
+ uint16 BehaviorID;
uint8 BehaviorTier;
- int32 BehaviorID;
+ int32 Fallback;
int32 Flags[2];
};
@@ -2648,9 +2648,9 @@ struct SpellItemEnchantmentEntry
LocalizedString* HordeName;
uint32 EffectArg[MAX_ITEM_ENCHANTMENT_EFFECTS];
float EffectScalingPoints[MAX_ITEM_ENCHANTMENT_EFFECTS];
+ uint32 TransmogPlayerConditionID;
uint32 TransmogCost;
uint32 IconFileDataID;
- uint32 TransmogPlayerConditionID;
int16 EffectPointsMin[MAX_ITEM_ENCHANTMENT_EFFECTS];
uint16 ItemVisual;
uint16 Flags;