diff options
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 13 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/TicketPackets.h | 4 | ||||
| -rw-r--r-- | src/server/shared/DataStores/DB2DatabaseLoader.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Packets/ByteBuffer.h | 4 |
8 files changed, 14 insertions, 18 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 66ee56c21ca..01a0850365a 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -766,7 +766,7 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale) for (NamesReservedLocaleEntry const* namesReserved : sNamesReservedLocaleStore) { - ASSERT(!(namesReserved->LocaleMask & ~((1 << TOTAL_LOCALES) - 1))); + ASSERT(!(namesReserved->LocaleMask & ~((1u << TOTAL_LOCALES) - 1))); std::wstring name; ASSERT(Utf8toWStr(namesReserved->Name, name)); for (uint32 i = 0; i < TOTAL_LOCALES; ++i) diff --git a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h index cc9e75c01ce..98778d9fa83 100644 --- a/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h +++ b/src/server/game/Entities/AreaTrigger/AreaTriggerTemplate.h @@ -105,6 +105,7 @@ public: AreaTriggerTemplate() { Id = 0; + Type = AREATRIGGER_TYPE_MAX; Flags = 0; ScriptId = 0; MaxSearchRadius = 0.0f; diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 2edae6f50ae..f44fd4932e8 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -660,7 +660,7 @@ typedef std::list<VendorItemCount> VendorItemCounts; struct TrainerSpell { - TrainerSpell() : SpellID(0), MoneyCost(0), ReqSkillLine(0), ReqSkillRank(0), ReqLevel(0) + TrainerSpell() : SpellID(0), MoneyCost(0), ReqSkillLine(0), ReqSkillRank(0), ReqLevel(0), Index(0) { for (uint8 i = 0; i < MAX_TRAINERSPELL_ABILITY_REQS; ++i) ReqAbility[i] = 0; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 40cca32bc56..1c766894219 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -26795,14 +26795,12 @@ float Player::GetAverageItemLevel() const if (i == EQUIPMENT_SLOT_TABARD || i == EQUIPMENT_SLOT_RANGED || i == EQUIPMENT_SLOT_OFFHAND || i == EQUIPMENT_SLOT_BODY) continue; - if (m_items[i] && m_items[i]->GetTemplate()) + if (m_items[i]) sum += m_items[i]->GetItemLevel(this); ++count; } - if (count == 0) - return 0; return ((float)sum) / count; } diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4119f74ee82..afafb063d8d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -13207,14 +13207,11 @@ uint32 Unit::GetModelForForm(ShapeshiftForm form) const break; } } - else - { - if (Player::TeamForRace(getRace()) == ALLIANCE) - return (getRace() == RACE_WORGEN ? 37729 : 21243); - if (getRace() == RACE_TROLL) - return 37730; - return 21244; - } + if (Player::TeamForRace(getRace()) == ALLIANCE) + return (getRace() == RACE_WORGEN ? 37729 : 21243); + if (getRace() == RACE_TROLL) + return 37730; + return 21244; case FORM_MOONKIN_FORM: { switch (getRace()) diff --git a/src/server/game/Server/Packets/TicketPackets.h b/src/server/game/Server/Packets/TicketPackets.h index 7d4771d2625..27866e767ef 100644 --- a/src/server/game/Server/Packets/TicketPackets.h +++ b/src/server/game/Server/Packets/TicketPackets.h @@ -218,8 +218,8 @@ namespace WorldPackets ComplaintOffender Offender; uint32 MailID = 0; ComplaintChat Chat; - uint64 EventGuid; - uint64 InviteGuid; + uint64 EventGuid = 0; + uint64 InviteGuid = 0; }; class ComplaintResult final : public ServerPacket diff --git a/src/server/shared/DataStores/DB2DatabaseLoader.cpp b/src/server/shared/DataStores/DB2DatabaseLoader.cpp index a19b8a5b389..6eed726a45d 100644 --- a/src/server/shared/DataStores/DB2DatabaseLoader.cpp +++ b/src/server/shared/DataStores/DB2DatabaseLoader.cpp @@ -19,7 +19,7 @@ #include "Database/DatabaseEnv.h" #include "DB2Meta.h" -DB2LoadInfo::DB2LoadInfo() : DB2FileLoadInfo() +DB2LoadInfo::DB2LoadInfo() : DB2FileLoadInfo(), Statement(MAX_HOTFIXDATABASE_STATEMENTS) { } diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index df1e32ace59..3933f617910 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -604,8 +604,8 @@ class TC_SHARED_API ByteBuffer void append(const ByteBuffer& buffer) { - if (buffer.wpos()) - append(buffer.contents(), buffer.wpos()); + if (!buffer.empty()) + append(buffer.contents(), buffer.size()); } // can be used in SMSG_MONSTER_MOVE opcode |