diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-05-21 22:15:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-05-21 22:15:58 +0200 |
| commit | 4d69cc1c567180b408ddbadb9edf26859cf4c006 (patch) | |
| tree | a40d455e3b460861541f1d1d3f44943d07b9fbd1 /src/server/game/Entities | |
| parent | 92a289e45518e6a4c3a34fed6d28f09002e53352 (diff) | |
Core/Misc: GCC build and warning fixes
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/RestMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 3 |
6 files changed, 6 insertions, 17 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1a3fbe69bee..8cb05644006 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -602,8 +602,8 @@ void GameObject::Update(uint32 diff) m_lootState = GO_READY; // for other GOis same switched without delay to GO_READY break; } - // NO BREAK for switch (m_lootState) } + /* fallthrough */ case GO_READY: { if (m_respawnTime > 0) // timer on diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 56eabab98d1..c8245b14795 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -2453,7 +2453,6 @@ void Item::InitArtifactPowers(uint8 artifactId, uint8 artifactTier) continue; ArtifactPowerData powerData; - memset(&powerData, 0, sizeof(powerData)); powerData.ArtifactPowerId = artifactPower->ID; powerData.PurchasedRank = 0; powerData.CurrentRankWithBonus = (artifactPower->Flags & ARTIFACT_POWER_FLAG_FIRST) == ARTIFACT_POWER_FLAG_FIRST ? 1 : 0; @@ -2502,11 +2501,6 @@ void Item::ApplyArtifactPowerEnchantmentBonuses(EnchantmentSlot slot, uint32 enc break; case ITEM_ENCHANTMENT_TYPE_ARTIFACT_POWER_BONUS_RANK_BY_ID: { - auto indexItr = m_artifactPowerIdToIndex.find(enchant->EffectArg[i]); - uint16 index; - if (indexItr != m_artifactPowerIdToIndex.end()) - index = indexItr->second; - if (uint16 const* artifactPowerIndex = Trinity::Containers::MapGetValuePtr(m_artifactPowerIdToIndex, enchant->EffectArg[i])) { uint8 newRank = m_itemData->ArtifactPowers[*artifactPowerIndex].CurrentRankWithBonus; diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 564787bd3fd..a1fb875fcc6 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -537,7 +537,7 @@ struct ActivePlayerData : public IsUpdateFieldStructureTag, public HasChangesMas UpdateField<bool, 0, 2> BankAutoSortDisabled; UpdateField<bool, 0, 3> SortBagsRightToLeft; UpdateField<bool, 0, 4> InsertItemsLeftToRight; - UpdateFieldArray<DynamicUpdateField<UF::Research, -1, -1>, 1, 22, 23> Research; + UpdateFieldArray<DynamicUpdateField<UF::Research, 4294967295, 4294967295>, 1, 22, 23> Research; DynamicUpdateField<uint64, 0, 5> KnownTitles; DynamicUpdateField<uint16, 0, 6> ResearchSites; DynamicUpdateField<uint32, 0, 7> ResearchSiteProgress; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c2e5e8b02e1..2ad9cd137b6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5691,7 +5691,7 @@ void Player::InitializeSkillFields() uint32 i = 0; for (SkillLineEntry const* skillLine : sSkillLineStore) { - if (SkillRaceClassInfoEntry const* rcEntry = sDB2Manager.GetSkillRaceClassInfo(skillLine->ID, getRace(), getClass())) + if (sDB2Manager.GetSkillRaceClassInfo(skillLine->ID, getRace(), getClass())) { SetSkillLineId(i, skillLine->ID); SetSkillStartingRank(i, 1); @@ -9737,7 +9737,7 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid) case 4197: if (bf && bf->GetTypeId() == BATTLEFIELD_WG) bf->FillInitialWorldStates(packet); - // No break here, intended. + /* fallthrough */ default: packet.Worldstates.emplace_back(0x914, 0x0); // 7 packet.Worldstates.emplace_back(0x913, 0x0); // 8 diff --git a/src/server/game/Entities/Player/RestMgr.cpp b/src/server/game/Entities/Player/RestMgr.cpp index e93890fac4d..123e09a108d 100644 --- a/src/server/game/Entities/Player/RestMgr.cpp +++ b/src/server/game/Entities/Player/RestMgr.cpp @@ -30,8 +30,6 @@ RestMgr::RestMgr(Player* player) : _player(player), _restTime(0), _innAreaTrigge void RestMgr::SetRestBonus(RestTypes restType, float restBonus) { - uint8 rest_rested_offset; - uint8 rest_state_offset; int32 next_level_xp; bool affectedByRaF = false; @@ -42,8 +40,6 @@ void RestMgr::SetRestBonus(RestTypes restType, float restBonus) if (_player->getLevel() >= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) restBonus = 0; - rest_rested_offset = REST_RESTED_XP; - rest_state_offset = REST_STATE_XP; next_level_xp = _player->m_activePlayerData->NextLevelXP; affectedByRaF = true; break; @@ -52,8 +48,6 @@ void RestMgr::SetRestBonus(RestTypes restType, float restBonus) if (_player->IsMaxHonorLevel()) restBonus = 0; - rest_rested_offset = REST_RESTED_HONOR; - rest_state_offset = REST_STATE_HONOR; next_level_xp = _player->m_activePlayerData->HonorNextLevel; break; default: diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index e3441184188..43ae9f624d0 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6935,6 +6935,7 @@ float Unit::GetUnitSpellCriticalChance(Unit* victim, SpellInfo const* spellProto return 0.0f; } // Do not add a break here, case fallthrough is intentional! Adding a break will make above spells unable to crit. + /* fallthrough */ case SPELL_DAMAGE_CLASS_MAGIC: { if (schoolMask & SPELL_SCHOOL_MASK_NORMAL) @@ -13536,7 +13537,7 @@ void Unit::SendClearTarget() int32 Unit::GetResistance(SpellSchoolMask mask) const { - Optional<int32> resist; + Optional<int32> resist = boost::make_optional(false, 0); for (int32 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; ++i) { int32 schoolResistance = GetResistance(SpellSchools(i)) + GetBonusResistanceMod(SpellSchools(i)); |
