From bccdd93f50b0b054176bad21c59d6d6122c3df69 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 19 Jul 2016 20:23:49 +0200 Subject: Build fixes --- src/server/game/DataStores/DB2Stores.cpp | 2 +- src/server/game/DataStores/GameTables.cpp | 2 +- src/server/game/DungeonFinding/LFGMgr.h | 2 ++ src/server/game/Entities/Item/Item.cpp | 3 +-- src/server/game/Entities/Player/CollectionMgr.h | 2 ++ src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Entities/Unit/StatSystem.cpp | 3 --- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Garrison/Garrison.cpp | 2 +- src/server/game/Miscellaneous/SharedDefines.h | 4 ++-- src/server/game/Server/Packets/MovementPackets.cpp | 2 ++ 11 files changed, 14 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 40eeae312f8..61d00eb8947 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -685,7 +685,7 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale) for (PhaseXPhaseGroupEntry const* group : sPhaseXPhaseGroupStore) if (PhaseEntry const* phase = sPhaseStore.LookupEntry(group->PhaseID)) - _phasesByGroup[group->PhaseGroupID].insert(group->PhaseID); + _phasesByGroup[group->PhaseGroupID].insert(phase->ID); for (PvPDifficultyEntry const* entry : sPvpDifficultyStore) { diff --git a/src/server/game/DataStores/GameTables.cpp b/src/server/game/DataStores/GameTables.cpp index 69637914b0e..8d46021c2a3 100644 --- a/src/server/game/DataStores/GameTables.cpp +++ b/src/server/game/DataStores/GameTables.cpp @@ -77,7 +77,7 @@ inline uint32 LoadGameTable(std::vector& errors, GameTable& stor ++end; - ASSERT(std::distance(values.begin(), end) == columnDefs.size(), SZFMTD " == " SZFMTD, std::distance(values.begin(), end), columnDefs.size()); + ASSERT(std::size_t(std::distance(values.begin(), end)) == columnDefs.size(), SZFMTD " == " SZFMTD, std::size_t(std::distance(values.begin(), end)), columnDefs.size()); // client ignores id column - CombatRatings has copypasted rows for levels > 110 //ASSERT(strtol(values[0], nullptr, 10) == data.size(), diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 63770e31d8f..c3a77bb53c5 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -133,6 +133,8 @@ struct LfgProposal; struct LfgProposalPlayer; struct LfgPlayerBoot; +struct LfgDungeonsEntry; + typedef std::map LfgQueueContainer; typedef std::multimap LfgRewardContainer; typedef std::pair LfgRewardContainerBounds; diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index f45f14eb427..919b060b582 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -2054,8 +2054,7 @@ uint32 Item::GetVisibleEnchantmentId(Player const* owner) const if (HasFlag(ITEM_FIELD_MODIFIERS_MASK, IllusionModifierMaskSpecSpecific)) illusionModifier = IllusionModifierSlotBySpec[owner->GetActiveTalentGroup()]; - if (ItemModifiedAppearanceEntry const* transmog = sItemModifiedAppearanceStore.LookupEntry(GetModifier(illusionModifier))) - if (uint32 enchantIllusion = GetModifier(ITEM_MODIFIER_ENCHANT_ILLUSION_ALL_SPECS)) + if (uint32 enchantIllusion = GetModifier(illusionModifier)) return enchantIllusion; return GetEnchantmentId(PERM_ENCHANTMENT_SLOT); diff --git a/src/server/game/Entities/Player/CollectionMgr.h b/src/server/game/Entities/Player/CollectionMgr.h index 6547bea5b71..7090995689d 100644 --- a/src/server/game/Entities/Player/CollectionMgr.h +++ b/src/server/game/Entities/Player/CollectionMgr.h @@ -21,6 +21,8 @@ #include "WorldSession.h" #include +struct ItemModifiedAppearanceEntry; + enum HeirloomPlayerFlags { HEIRLOOM_FLAG_NONE = 0x00, diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6aa24c3fd5d..9389f114b89 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4868,7 +4868,7 @@ float Player::GetTotalBaseModValue(BaseModGroup modGroup) const return m_auraBaseMod[modGroup][FLAT_MOD] * m_auraBaseMod[modGroup][PCT_MOD]; } -void Player::GetDodgeFromAgility(float &diminishing, float &nondiminishing) const +void Player::GetDodgeFromAgility(float &/*diminishing*/, float &/*nondiminishing*/) const { //// Table for base dodge values //const float dodge_base[MAX_CLASSES] = diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 2c9da5cf672..13a84e499f2 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -91,9 +91,6 @@ void Unit::UpdateDamagePhysical(WeaponAttackType attType) bool Player::UpdateStats(Stats stat) { - if (stat >= MAX_STATS) - return false; - // value = ((base_value * base_pct) + total_value) * total_pct float value = GetTotalStatValue(stat); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index eb4df766636..ea36658b786 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6018,7 +6018,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Used in case when access to whole aura is needed // All procs should be handled like this... -bool Unit::HandleAuraProc(Unit* /*victim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellInfo const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown, bool * handled) +bool Unit::HandleAuraProc(Unit* /*victim*/, uint32 /*damage*/, Aura* triggeredByAura, SpellInfo const* /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 /*cooldown*/, bool * handled) { SpellInfo const* dummySpell = triggeredByAura->GetSpellInfo(); diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 970dd893f1d..2e14b55d30b 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -47,7 +47,7 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue { fields = blueprints->Fetch(); if (GarrBuildingEntry const* building = sGarrBuildingStore.LookupEntry(fields[0].GetUInt32())) - _knownBuildings.insert(fields[0].GetUInt32()); + _knownBuildings.insert(building->ID); } while (blueprints->NextRow()); } diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 05b8684a9ee..50673cca05d 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -245,7 +245,7 @@ enum Stats : uint16 #define MAX_STATS 4 -enum Powers // (6.0) +enum Powers : uint8 { POWER_MANA = 0, POWER_RAGE = 1, @@ -268,7 +268,7 @@ enum Powers // (6.0) POWER_PAIN = 18, MAX_POWERS = 19, POWER_ALL = 127, // default for class? - POWER_HEALTH = 0xFFFFFFFE // (-2 as signed value) + POWER_HEALTH = 0xFE // (-2 as signed value) }; #define MAX_POWERS_PER_CLASS 6 diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index 35c14cf8ce3..cbd8da859a5 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -331,6 +331,8 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(:: case ::Movement::MONSTER_MOVE_FACING_ANGLE: data << moveSpline.facing.angle; // FaceDirection break; + default: + break; } if (HasJumpGravity) -- cgit v1.2.3