Core/Misc: Minor cosmetic change to avoid some merge conflicts

1 files changed, 136 insertions, 141 deletions

diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 33dcaacb985..cbbcb46bd08 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -22,151 +22,146 @@
 // x - skip<uint32>, X - skip<uint8>, s - char*, f - float, i - uint32, b - uint8, d - index (not included)
 // n - index (included), l - bool, p - field present in sql dbc, a - field absent in sql dbc
 
-char const Achievementfmt[]="niixsxiixixxii";
-const std::string CustomAchievementfmt="pppaaaapapaapp";
+char const Achievementfmt[] = "niixsxiixixxii";
+const std::string CustomAchievementfmt = "pppaaaapapaapp";
 const std::string CustomAchievementIndex = "ID";
-char const AchievementCriteriafmt[]="niiiiiiiisiiiiixxiiiiii";
-char const AreaTableEntryfmt[]="iiinixxxxxisiiiiiffixxxxxx";
-char const AreaGroupEntryfmt[]="niiiiiii";
-char const AreaPOIEntryfmt[]="niiiiiiiiiiiffixixxixx";
-char const AreaTriggerEntryfmt[]="nifffxxxfffff";
-char const ArmorLocationfmt[]="nfffff";
-char const AuctionHouseEntryfmt[]="niiix";
-char const BankBagSlotPricesEntryfmt[]="ni";
-char const BarberShopStyleEntryfmt[]="nixxxiii";
-char const BattlemasterListEntryfmt[]="niiiiiiiiixsiiiixxxx";
-char const CharStartOutfitEntryfmt[]="diiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixxx";
-char const CharTitlesEntryfmt[]="nxsxix";
-char const ChatChannelsEntryfmt[]="nixsx";
-
-char const ChrClassesEntryfmt[]="nixsxxxixiiiii";
-char const ChrRacesEntryfmt[]="nxixiixixxxxixsxxxxxixxx";
-char const ChrClassesXPowerTypesfmt[]="nii";
-
-char const CinematicSequencesEntryfmt[]="nxxxxxxxxx";
-char const CreatureDisplayInfofmt[]="nixxfxxxxxxxxxxxx";
-char const CreatureModelDatafmt[]="nxxxxxxxxxxxxxffxxxxxxxxxxxxxxx";
-char const CreatureFamilyfmt[]="nfifiiiiixsx";
-char const CreatureSpellDatafmt[]="niiiixxxx";
-char const CreatureTypefmt[]="nxx";
-char const CurrencyTypesfmt[]="nixxxiiiiix";
-
-char const DestructibleModelDatafmt[]="ixxixxxixxxixxxixxxxxxxx";
-char const DungeonEncounterfmt[]="iiixisxx";
-char const DurabilityCostsfmt[]="niiiiiiiiiiiiiiiiiiiiiiiiiiiii";
-char const DurabilityQualityfmt[]="nf";
-char const EmotesEntryfmt[]="nxxiiixx";
-char const EmotesTextEntryfmt[]="nxixxxxxxxxxxxxxxxx";
-char const FactionEntryfmt[]="niiiiiiiiiiiiiiiiiiffixsxi";
-char const FactionTemplateEntryfmt[]="niiiiiiiiiiiii";
-char const GameObjectDisplayInfofmt[]="nsxxxxxxxxxxffffffxxx";
-
-char const GemPropertiesEntryfmt[]="nixxii";
-char const GlyphPropertiesfmt[]="niii";
-char const GlyphSlotfmt[]="nii";
-
-char const GtBarberShopCostBasefmt[]="xf";
-char const GtCombatRatingsfmt[]="xf";
-char const GtOCTHpPerStaminafmt[]="df";
-char const GtChanceToMeleeCritBasefmt[]="xf";
-char const GtChanceToMeleeCritfmt[]="xf";
-char const GtChanceToSpellCritBasefmt[]="xf";
-char const GtChanceToSpellCritfmt[]="xf";
-char const GtOCTClassCombatRatingScalarfmt[]="df";
-char const GtOCTRegenHPfmt[]="f";
-//char const GtOCTRegenMPfmt[]="f";
-char const GtRegenMPPerSptfmt[]="xf";
-char const GtSpellScalingfmt[]="df";
-char const GtOCTBaseHPByClassfmt[]="df";
-char const GtOCTBaseMPByClassfmt[]="df";
-char const GuildPerkSpellsfmt[]="dii";
-char const Holidaysfmt[]="niiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiixxsiix";
-char const ImportPriceArmorfmt[]="nffff";
-char const ImportPriceQualityfmt[]="nf";
-char const ImportPriceShieldfmt[]="nf";
-char const ImportPriceWeaponfmt[]="nf";
-char const ItemPriceBasefmt[]="diff";
-char const ItemReforgefmt[]="nifif";
-char const ItemBagFamilyfmt[]="nx";
-char const ItemArmorQualityfmt[]="nfffffffi";
-char const ItemArmorShieldfmt[]="nifffffff";
-char const ItemArmorTotalfmt[]="niffff";
-char const ItemClassfmt[]="dixxfx";
-char const ItemDamagefmt[]="nfffffffi";
-char const ItemDisenchantLootfmt[]="niiiiii";
-//char const ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx";
-char const ItemLimitCategoryEntryfmt[]="nxii";
-char const ItemRandomPropertiesfmt[]="nxiiixxs";
-char const ItemRandomSuffixfmt[]="nsxiiiiiiiiii";
-char const ItemSetEntryfmt[]="dsiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii";
-char const LFGDungeonEntryfmt[]="nsiiiiiiiiixxixixixxx";
-char const LiquidTypefmt[]="nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-char const LockEntryfmt[]="niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
-char const PhaseEntryfmt[]="nsi";
-char const MailTemplateEntryfmt[]="nxs";
-char const MapEntryfmt[]="nxixxxsixxixiffxiixi";
-char const MapDifficultyEntryfmt[]="diisiix";
-char const MovieEntryfmt[]="nxxx";
-char const MountCapabilityfmt[]="niiiiiii";
-char const MountTypefmt[]="niiiiiiiiiiiiiiiiiiiiiiii";
+char const AchievementCriteriafmt[] = "niiiiiiiisiiiiixxiiiiii";
+char const AreaTableEntryfmt[] = "iiinixxxxxisiiiiiffixxxxxx";
+char const AreaGroupEntryfmt[] = "niiiiiii";
+char const AreaPOIEntryfmt[] = "niiiiiiiiiiiffixixxixx";
+char const AreaTriggerEntryfmt[] = "nifffxxxfffff";
+char const ArmorLocationfmt[] = "nfffff";
+char const AuctionHouseEntryfmt[] = "niiix";
+char const BankBagSlotPricesEntryfmt[] = "ni";
+char const BarberShopStyleEntryfmt[] = "nixxxiii";
+char const BattlemasterListEntryfmt[] = "niiiiiiiiixsiiiixxxx";
+char const CharStartOutfitEntryfmt[] = "diiiiiiiiiiiiiiiiiiiiiiiiixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxiixxx";
+char const CharTitlesEntryfmt[] = "nxsxix";
+char const ChatChannelsEntryfmt[] = "nixsx";
+char const ChrClassesEntryfmt[] = "nixsxxxixiiiii";
+char const ChrRacesEntryfmt[] = "nxixiixixxxxixsxxxxxixxx";
+char const ChrClassesXPowerTypesfmt[] = "nii";
+char const CinematicSequencesEntryfmt[] = "nxxxxxxxxx";
+char const CreatureDisplayInfofmt[] = "nixxfxxxxxxxxxxxx";
+char const CreatureModelDatafmt[] = "nxxxxxxxxxxxxxffxxxxxxxxxxxxxxx";
+char const CreatureFamilyfmt[] = "nfifiiiiixsx";
+char const CreatureSpellDatafmt[] = "niiiixxxx";
+char const CreatureTypefmt[] = "nxx";
+char const CurrencyTypesfmt[] = "nixxxiiiiix";
+char const DestructibleModelDatafmt[] = "ixxixxxixxxixxxixxxxxxxx";
+char const DungeonEncounterfmt[] = "iiixisxx";
+char const DurabilityCostsfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+char const DurabilityQualityfmt[] = "nf";
+char const EmotesEntryfmt[] = "nxxiiixx";
+char const EmotesTextEntryfmt[] = "nxixxxxxxxxxxxxxxxx";
+char const FactionEntryfmt[] = "niiiiiiiiiiiiiiiiiiffixsxi";
+char const FactionTemplateEntryfmt[] = "niiiiiiiiiiiii";
+char const GameObjectDisplayInfofmt[] = "nsxxxxxxxxxxffffffxxx";
+char const GemPropertiesEntryfmt[] = "nixxii";
+char const GlyphPropertiesfmt[] = "niii";
+char const GlyphSlotfmt[] = "nii";
+char const GtBarberShopCostBasefmt[] = "xf";
+char const GtCombatRatingsfmt[] = "xf";
+char const GtOCTHpPerStaminafmt[] = "df";
+char const GtChanceToMeleeCritBasefmt[] = "xf";
+char const GtChanceToMeleeCritfmt[] = "xf";
+char const GtChanceToSpellCritBasefmt[] = "xf";
+char const GtChanceToSpellCritfmt[] = "xf";
+char const GtOCTClassCombatRatingScalarfmt[] = "df";
+char const GtOCTRegenHPfmt[] = "f";
+//char const GtOCTRegenMPfmt[] = "f";
+char const GtRegenMPPerSptfmt[] = "xf";
+char const GtSpellScalingfmt[] = "df";
+char const GtOCTBaseHPByClassfmt[] = "df";
+char const GtOCTBaseMPByClassfmt[] = "df";
+char const GuildPerkSpellsfmt[] = "dii";
+char const Holidaysfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiixxsiix";
+char const ImportPriceArmorfmt[] = "nffff";
+char const ImportPriceQualityfmt[] = "nf";
+char const ImportPriceShieldfmt[] = "nf";
+char const ImportPriceWeaponfmt[] = "nf";
+char const ItemPriceBasefmt[] = "diff";
+char const ItemReforgefmt[] = "nifif";
+char const ItemBagFamilyfmt[] = "nx";
+char const ItemArmorQualityfmt[] = "nfffffffi";
+char const ItemArmorShieldfmt[] = "nifffffff";
+char const ItemArmorTotalfmt[] = "niffff";
+char const ItemClassfmt[] = "dixxfx";
+char const ItemDamagefmt[] = "nfffffffi";
+char const ItemDisenchantLootfmt[] = "niiiiii";
+//char const ItemDisplayTemplateEntryfmt[] = "nxxxxxxxxxxixxxxxxxxxxx";
+char const ItemLimitCategoryEntryfmt[] = "nxii";
+char const ItemRandomPropertiesfmt[] = "nxiiixxs";
+char const ItemRandomSuffixfmt[] = "nsxiiiiiiiiii";
+char const ItemSetEntryfmt[] = "dsiiiiiiiiiixxxxxxxiiiiiiiiiiiiiiiiii";
+char const LFGDungeonEntryfmt[] = "nsiiiiiiiiixxixixixxx";
+char const LiquidTypefmt[] = "nxxixixxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+char const LockEntryfmt[] = "niiiiiiiiiiiiiiiiiiiiiiiixxxxxxxx";
+char const PhaseEntryfmt[] = "nsi";
+char const MailTemplateEntryfmt[] = "nxs";
+char const MapEntryfmt[] = "nxixxxsixxixiffxiixi";
+char const MapDifficultyEntryfmt[] = "diisiix";
+char const MovieEntryfmt[] = "nxxx";
+char const MountCapabilityfmt[] = "niiiiiii";
+char const MountTypefmt[] = "niiiiiiiiiiiiiiiiiiiiiiii";
 char const NameGenfmt[] = "dsii";
-char const NumTalentsAtLevelfmt[]="df";
-char const OverrideSpellDatafmt[]="niiiiiiiiiixx";
-char const QuestSortEntryfmt[]="nx";
-char const QuestXPfmt[]="niiiiiiiiii";
-char const QuestFactionRewardfmt[]="niiiiiiiiii";
-char const PvPDifficultyfmt[]="diiiii";
-char const RandomPropertiesPointsfmt[]="niiiiiiiiiiiiiii";
-char const ScalingStatDistributionfmt[]="niiiiiiiiiiiiiiiiiiiixi";
-char const ScalingStatValuesfmt[]="iniiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
-char const SkillLinefmt[]="nisxixi";
-char const SkillLineAbilityfmt[]="niiiixxiiiiiii";
-char const SoundEntriesfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
-char const SpellCastTimefmt[]="nixx";
-char const SpellCategoriesEntryfmt[]="diiiiii";
-char const SpellDifficultyfmt[]="niiii";
-const std::string CustomSpellDifficultyfmt="ppppp";
-const std::string CustomSpellDifficultyIndex="id";
-char const SpellDurationfmt[]="niii";
-char const SpellEffectEntryfmt[]="nifiiiffiiiiiifiifiiiiiiiix";
-char const SpellEntryfmt[]="niiiiiiiiiiiiiiifiiiissxxiixxifiiiiiiixiiiiiiiix";
-const std::string CustomSpellEntryfmt="papppppppppppapapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
+char const NumTalentsAtLevelfmt[] = "df";
+char const OverrideSpellDatafmt[] = "niiiiiiiiiixx";
+char const QuestFactionRewardfmt[] = "niiiiiiiiii";
+char const QuestSortEntryfmt[] = "nx";
+char const QuestXPfmt[] = "niiiiiiiiii";
+char const PvPDifficultyfmt[] = "diiiii";
+char const RandomPropertiesPointsfmt[] = "niiiiiiiiiiiiiii";
+char const ScalingStatDistributionfmt[] = "niiiiiiiiiiiiiiiiiiiixi";
+char const ScalingStatValuesfmt[] = "iniiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii";
+char const SkillLinefmt[] = "nisxixi";
+char const SkillLineAbilityfmt[] = "niiiixxiiiiiii";
+char const SoundEntriesfmt[] = "nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+char const SpellCastTimefmt[] = "nixx";
+char const SpellCategoriesEntryfmt[] = "diiiiii";
+char const SpellDifficultyfmt[] = "niiii";
+const std::string CustomSpellDifficultyfmt = "ppppp";
+const std::string CustomSpellDifficultyIndex = "id";
+char const SpellDurationfmt[] = "niii";
+char const SpellEffectEntryfmt[] = "nifiiiffiiiiiifiifiiiiiiiix";
+char const SpellEntryfmt[] = "niiiiiiiiiiiiiiifiiiissxxiixxifiiiiiiixiiiiiiiix";
+const std::string CustomSpellEntryfmt = "papppppppppppapapaaaaaaaaaaapaaapapppppppaaaaapaapaaaaaaaaaaaaaaaaaappppppppppppppppppppppppppppppppppppaaaaaapppppppppaaapppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaappppppppapppaaaaappaaaaaaa";
 const std::string CustomSpellEntryIndex = "Id";
-char const SpellFocusObjectfmt[]="nx";
-char const SpellItemEnchantmentfmt[]="nxiiiiiixxxiiisiiiiiiix";
-char const SpellItemEnchantmentConditionfmt[]="nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX";
-char const SpellRadiusfmt[]="nfff";
-char const SpellRangefmt[]="nffffixx";
-char const SpellReagentsEntryfmt[]="diiiiiiiiiiiiiiii";
-char const SpellScalingEntryfmt[]="diiiiffffffffffi";
-char const SpellTotemsEntryfmt[]="niiii";
-char const SpellTargetRestrictionsEntryfmt[]="nxiiii";
-char const SpellPowerEntryfmt[]="diiiiixf";
-char const SpellInterruptsEntryfmt[]="dixixi";
-char const SpellEquippedItemsEntryfmt[]="diii";
-char const SpellAuraOptionsEntryfmt[]="niiii";
-char const SpellAuraRestrictionsEntryfmt[]="diiiiiiii";
-char const SpellCastingRequirementsEntryfmt[]="dixxixi";
-char const SpellClassOptionsEntryfmt[]="dxiiiix";
-char const SpellCooldownsEntryfmt[]="diii";
-char const SpellLevelsEntryfmt[]="diii";
-char const SpellRuneCostfmt[]="niiii";
-char const SpellShapeshiftEntryfmt[]="nixixx";
-char const SpellShapeshiftFormfmt[]="nxxiixiiixxiiiiiiiixx";
+char const SpellFocusObjectfmt[] = "nx";
+char const SpellItemEnchantmentfmt[] = "nxiiiiiixxxiiisiiiiiiix";
+char const SpellItemEnchantmentConditionfmt[] = "nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX";
+char const SpellRadiusfmt[] = "nfff";
+char const SpellRangefmt[] = "nffffixx";
+char const SpellReagentsEntryfmt[] = "diiiiiiiiiiiiiiii";
+char const SpellScalingEntryfmt[] = "diiiiffffffffffi";
+char const SpellTotemsEntryfmt[] = "niiii";
+char const SpellTargetRestrictionsEntryfmt[] = "nxiiii";
+char const SpellPowerEntryfmt[] = "diiiiixf";
+char const SpellInterruptsEntryfmt[] = "dixixi";
+char const SpellEquippedItemsEntryfmt[] = "diii";
+char const SpellAuraOptionsEntryfmt[] = "niiii";
+char const SpellAuraRestrictionsEntryfmt[] = "diiiiiiii";
+char const SpellCastingRequirementsEntryfmt[] = "dixxixi";
+char const SpellClassOptionsEntryfmt[] = "dxiiiix";
+char const SpellCooldownsEntryfmt[] = "diii";
+char const SpellLevelsEntryfmt[] = "diii";
+char const SpellRuneCostfmt[] = "niiii";
+char const SpellShapeshiftEntryfmt[] = "nixixx";
+char const SpellShapeshiftFormfmt[] = "nxxiixiiixxiiiiiiiixx";
 char const StableSlotPricesfmt[] = "ni";
 char const SummonPropertiesfmt[] = "niiiii";
-char const TalentEntryfmt[]="niiiiiiiiixxixxxxxx";
-char const TalentTabEntryfmt[]="nxxiiixxxxx";
-char const TalentTreePrimarySpellsfmt[]="diix";
-char const TaxiNodesEntryfmt[]="nifffsiiixx";
-char const TaxiPathEntryfmt[]="niii";
-char const TaxiPathNodeEntryfmt[]="diiifffiiii";
-char const TotemCategoryEntryfmt[]="nxii";
-char const VehicleEntryfmt[]="niffffiiiiiiiifffffffffffffffssssfifiixx";
-char const VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxxxxxxxxxx";
-char const WMOAreaTableEntryfmt[]="niiixxxxxiixxxx";
-char const WorldMapAreaEntryfmt[]="xinxffffixxxxx";
-char const WorldMapOverlayEntryfmt[]="nxiiiixxxxxxxxx";
-char const WorldSafeLocsEntryfmt[]="nifffx";
+char const TalentEntryfmt[] = "niiiiiiiiixxixxxxxx";
+char const TalentTabEntryfmt[] = "nxxiiixxxxx";
+char const TalentTreePrimarySpellsfmt[] = "diix";
+char const TaxiNodesEntryfmt[] = "nifffsiiixx";
+char const TaxiPathEntryfmt[] = "niii";
+char const TaxiPathNodeEntryfmt[] = "diiifffiiii";
+char const TotemCategoryEntryfmt[] = "nxii";
+char const VehicleEntryfmt[] = "niffffiiiiiiiifffffffffffffffssssfifiixx";
+char const VehicleSeatEntryfmt[] = "niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxxxxxxxxxx";
+char const WMOAreaTableEntryfmt[] = "niiixxxxxiixxxx";
+char const WorldMapAreaEntryfmt[] = "xinxffffixxxxx";
+char const WorldMapOverlayEntryfmt[] = "nxiiiixxxxxxxxx";
+char const WorldSafeLocsEntryfmt[] = "nifffx";
 
 #endif