public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): code cleanup (part 1) (#6361)

Browse Source
This commit is contained in:
Francesco Borzì
2021-06-16 12:58:14 +02:00
committed by GitHub
parent 7dd97ae679
commit 7d9fe22e28
13 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/AI/CoreAI/GuardAI.cpp
View File

@@ -5,11 +5,8 @@
*/ */
#include "CreatureAIImpl.h" #include "CreatureAIImpl.h"
#include "Errors.h"
#include "GuardAI.h" #include "GuardAI.h"
#include "ObjectAccessor.h"
#include "Player.h" #include "Player.h"
#include "World.h"
int GuardAI::Permissible(Creature const* creature) int GuardAI::Permissible(Creature const* creature)
{ {

3
src/server/game/AI/CoreAI/PetAI.cpp
View File

@@ -5,7 +5,6 @@
*/ */
#include "Creature.h" #include "Creature.h"
#include "DBCStores.h"
#include "Errors.h" #include "Errors.h"
#include "Group.h" #include "Group.h"
#include "ObjectAccessor.h" #include "ObjectAccessor.h"
@@ -17,8 +16,6 @@
#include "SpellInfo.h" #include "SpellInfo.h"
#include "SpellMgr.h" #include "SpellMgr.h"
#include "Util.h" #include "Util.h"
#include "World.h"
#include "WorldSession.h"
int PetAI::Permissible(const Creature* creature) int PetAI::Permissible(const Creature* creature)
{ {

3
src/server/game/AI/CoreAI/ReactorAI.cpp
View File

@@ -4,11 +4,8 @@
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*/ */
#include "ByteBuffer.h"
#include "CreatureAIImpl.h" #include "CreatureAIImpl.h"
#include "Errors.h" #include "Errors.h"
#include "Log.h"
#include "ObjectAccessor.h"
#include "ReactorAI.h" #include "ReactorAI.h"
int ReactorAI::Permissible(const Creature* creature) int ReactorAI::Permissible(const Creature* creature)

5
src/server/game/AI/CreatureAI.cpp
View File

@@ -13,7 +13,6 @@
#include "Player.h" #include "Player.h"
#include "SpellMgr.h" #include "SpellMgr.h"
#include "Vehicle.h" #include "Vehicle.h"
#include "World.h"
//Disable CreatureAI when charmed //Disable CreatureAI when charmed
void CreatureAI::OnCharmed(bool /*apply*/) void CreatureAI::OnCharmed(bool /*apply*/)
@@ -103,8 +102,10 @@ void CreatureAI::DoZoneInCombat(Creature* creature /*= nullptr*/, float maxRange
// MoveInLineOfSight can be called inside another MoveInLineOfSight and cause stack overflow // MoveInLineOfSight can be called inside another MoveInLineOfSight and cause stack overflow
void CreatureAI::MoveInLineOfSight_Safe(Unit* who) void CreatureAI::MoveInLineOfSight_Safe(Unit* who)
{ {
if (m_MoveInLineOfSight_locked == true) if (m_MoveInLineOfSight_locked)
{
return; return;
}
m_MoveInLineOfSight_locked = true; m_MoveInLineOfSight_locked = true;
MoveInLineOfSight(who); MoveInLineOfSight(who);
m_MoveInLineOfSight_locked = false; m_MoveInLineOfSight_locked = false;

6
src/server/game/Addons/AddonMgr.cpp
View File

@@ -59,7 +59,7 @@ namespace AddonMgr
result = CharacterDatabase.Query("SELECT id, name, version, UNIX_TIMESTAMP(timestamp) FROM banned_addons"); result = CharacterDatabase.Query("SELECT id, name, version, UNIX_TIMESTAMP(timestamp) FROM banned_addons");
if (result) if (result)
{ {
uint32 count = 0; uint32 count2 = 0;
uint32 offset = 102; uint32 offset = 102;
do do
@@ -78,10 +78,10 @@ namespace AddonMgr
m_bannedAddons.push_back(addon); m_bannedAddons.push_back(addon);
++count; ++count2;
} while (result->NextRow()); } while (result->NextRow());
LOG_INFO("server", ">> Loaded %u banned addons in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); LOG_INFO("server", ">> Loaded %u banned addons in %u ms", count2, GetMSTimeDiffToNow(oldMSTime));
LOG_INFO("server", " "); LOG_INFO("server", " ");
} }
} }

21
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
View File

@@ -10,7 +10,6 @@
#include "BattlefieldWG.h" #include "BattlefieldWG.h"
#include "MapManager.h" #include "MapManager.h"
#include "ObjectMgr.h"
#include "Opcodes.h" #include "Opcodes.h"
#include "Player.h" #include "Player.h"
#include "SpellAuras.h" #include "SpellAuras.h"
@@ -740,27 +739,31 @@ void BattlefieldWG::PromotePlayer(Player* killer)
if (!m_isActive) if (!m_isActive)
return; return;
// Updating rank of player // Updating rank of player
if (Aura* aur = killer->GetAura(SPELL_RECRUIT)) if (Aura* recruitAura = killer->GetAura(SPELL_RECRUIT))
{ {
if (aur->GetStackAmount() >= 5) if (recruitAura->GetStackAmount() >= 5)
{ {
killer->RemoveAura(SPELL_RECRUIT); killer->RemoveAura(SPELL_RECRUIT);
killer->CastSpell(killer, SPELL_CORPORAL, true); killer->CastSpell(killer, SPELL_CORPORAL, true);
SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_FIRSTRANK); SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_FIRSTRANK);
} }
else else
{
killer->CastSpell(killer, SPELL_RECRUIT, true); killer->CastSpell(killer, SPELL_RECRUIT, true);
}
} }
else if (Aura* aur = killer->GetAura(SPELL_CORPORAL)) else if (Aura* corporalAura = killer->GetAura(SPELL_CORPORAL))
{ {
if (aur->GetStackAmount() >= 5) if (corporalAura->GetStackAmount() >= 5)
{ {
killer->RemoveAura(SPELL_CORPORAL); killer->RemoveAura(SPELL_CORPORAL);
killer->CastSpell(killer, SPELL_LIEUTENANT, true); killer->CastSpell(killer, SPELL_LIEUTENANT, true);
SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_SECONDRANK); SendWarningToPlayer(killer, BATTLEFIELD_WG_TEXT_SECONDRANK);
} }
else else
{
killer->CastSpell(killer, SPELL_CORPORAL, true); killer->CastSpell(killer, SPELL_CORPORAL, true);
}
} }
} }
@@ -990,9 +993,13 @@ void BattlefieldWG::ProcessEvent(WorldObject* obj, uint32 eventId)
if (go->GetEntry() == GO_WINTERGRASP_TITAN_S_RELIC) if (go->GetEntry() == GO_WINTERGRASP_TITAN_S_RELIC)
{ {
if (CanInteractWithRelic()) if (CanInteractWithRelic())
{
EndBattle(false); EndBattle(false);
else if (GameObject* go = GetRelic()) }
go->SetRespawnTime(RESPAWN_IMMEDIATELY); else if (GameObject* relic = GetRelic())
{
relic->SetRespawnTime(RESPAWN_IMMEDIATELY);
}
} }
// if destroy or damage event, search the wall/tower and update worldstate/send warning message // if destroy or damage event, search the wall/tower and update worldstate/send warning message

105
src/server/game/Battlegrounds/Battleground.cpp
View File

@@ -27,7 +27,6 @@
#include "Player.h" #include "Player.h"
#include "ReputationMgr.h" #include "ReputationMgr.h"
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "SpellAuraEffects.h"
#include "SpellAuras.h" #include "SpellAuras.h"
#include "Transport.h" #include "Transport.h"
#include "Util.h" #include "Util.h"
@@ -823,36 +822,36 @@ void Battleground::EndBattleground(TeamId winnerTeamId)
uint32 currOnline = (uint32)(sWorld->GetActiveSessionCount()); uint32 currOnline = (uint32)(sWorld->GetActiveSessionCount());
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_FIGHT); PreparedStatement* stmt2 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_FIGHT);
stmt->setUInt32(0, fightId); stmt2->setUInt32(0, fightId);
stmt->setUInt8(1, m_ArenaType); stmt2->setUInt8(1, m_ArenaType);
stmt->setUInt32(2, ((GetStartTime() <= startDelay ? 0 : GetStartTime() - startDelay) / 1000)); stmt2->setUInt32(2, ((GetStartTime() <= startDelay ? 0 : GetStartTime() - startDelay) / 1000));
stmt->setUInt32(3, winnerArenaTeam->GetId()); stmt2->setUInt32(3, winnerArenaTeam->GetId());
stmt->setUInt32(4, loserArenaTeam->GetId()); stmt2->setUInt32(4, loserArenaTeam->GetId());
stmt->setUInt16(5, (uint16)winnerTeamRating); stmt2->setUInt16(5, (uint16)winnerTeamRating);
stmt->setUInt16(6, (uint16)winnerMatchmakerRating); stmt2->setUInt16(6, (uint16)winnerMatchmakerRating);
stmt->setInt16(7, (int16)winnerChange); stmt2->setInt16(7, (int16)winnerChange);
stmt->setUInt16(8, (uint16)loserTeamRating); stmt2->setUInt16(8, (uint16)loserTeamRating);
stmt->setUInt16(9, (uint16)loserMatchmakerRating); stmt2->setUInt16(9, (uint16)loserMatchmakerRating);
stmt->setInt16(10, (int16)loserChange); stmt2->setInt16(10, (int16)loserChange);
stmt->setUInt32(11, currOnline); stmt2->setUInt32(11, currOnline);
trans->Append(stmt); trans->Append(stmt2);
uint8 memberId = 0; uint8 memberId = 0;
for (Battleground::ArenaLogEntryDataMap::const_iterator itr = ArenaLogEntries.begin(); itr != ArenaLogEntries.end(); ++itr) for (Battleground::ArenaLogEntryDataMap::const_iterator itr = ArenaLogEntries.begin(); itr != ArenaLogEntries.end(); ++itr)
{ {
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS); stmt2 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS);
stmt->setUInt32(0, fightId); stmt2->setUInt32(0, fightId);
stmt->setUInt8(1, ++memberId); stmt2->setUInt8(1, ++memberId);
stmt->setString(2, itr->second.Name); stmt2->setString(2, itr->second.Name);
stmt->setUInt32(3, itr->second.Guid); stmt2->setUInt32(3, itr->second.Guid);
stmt->setUInt32(4, itr->second.ArenaTeamId); stmt2->setUInt32(4, itr->second.ArenaTeamId);
stmt->setUInt32(5, itr->second.Acc); stmt2->setUInt32(5, itr->second.Acc);
stmt->setString(6, itr->second.IP); stmt2->setString(6, itr->second.IP);
stmt->setUInt32(7, itr->second.DamageDone); stmt2->setUInt32(7, itr->second.DamageDone);
stmt->setUInt32(8, itr->second.HealingDone); stmt2->setUInt32(8, itr->second.HealingDone);
stmt->setUInt32(9, itr->second.KillingBlows); stmt2->setUInt32(9, itr->second.KillingBlows);
trans->Append(stmt); trans->Append(stmt2);
} }
CharacterDatabase.CommitTransaction(trans); CharacterDatabase.CommitTransaction(trans);
@@ -882,36 +881,36 @@ void Battleground::EndBattleground(TeamId winnerTeamId)
uint32 currOnline = (uint32)(sWorld->GetActiveSessionCount()); uint32 currOnline = (uint32)(sWorld->GetActiveSessionCount());
SQLTransaction trans = CharacterDatabase.BeginTransaction(); SQLTransaction trans = CharacterDatabase.BeginTransaction();
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_FIGHT); PreparedStatement* stmt3 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_FIGHT);
stmt->setUInt32(0, fightId); stmt3->setUInt32(0, fightId);
stmt->setUInt8(1, m_ArenaType); stmt3->setUInt8(1, m_ArenaType);
stmt->setUInt32(2, ((GetStartTime() <= startDelay ? 0 : GetStartTime() - startDelay) / 1000)); stmt3->setUInt32(2, ((GetStartTime() <= startDelay ? 0 : GetStartTime() - startDelay) / 1000));
stmt->setUInt32(3, winnerArenaTeam->GetId()); stmt3->setUInt32(3, winnerArenaTeam->GetId());
stmt->setUInt32(4, loserArenaTeam->GetId()); stmt3->setUInt32(4, loserArenaTeam->GetId());
stmt->setUInt16(5, (uint16)winnerTeamRating); stmt3->setUInt16(5, (uint16)winnerTeamRating);
stmt->setUInt16(6, (uint16)winnerMatchmakerRating); stmt3->setUInt16(6, (uint16)winnerMatchmakerRating);
stmt->setInt16(7, (int16)winnerChange); stmt3->setInt16(7, (int16)winnerChange);
stmt->setUInt16(8, (uint16)loserTeamRating); stmt3->setUInt16(8, (uint16)loserTeamRating);
stmt->setUInt16(9, (uint16)loserMatchmakerRating); stmt3->setUInt16(9, (uint16)loserMatchmakerRating);
stmt->setInt16(10, (int16)loserChange); stmt3->setInt16(10, (int16)loserChange);
stmt->setUInt32(11, currOnline); stmt3->setUInt32(11, currOnline);
trans->Append(stmt); trans->Append(stmt3);
uint8 memberId = 0; uint8 memberId = 0;
for (Battleground::ArenaLogEntryDataMap::const_iterator itr = ArenaLogEntries.begin(); itr != ArenaLogEntries.end(); ++itr) for (Battleground::ArenaLogEntryDataMap::const_iterator itr = ArenaLogEntries.begin(); itr != ArenaLogEntries.end(); ++itr)
{ {
stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS); stmt3 = CharacterDatabase.GetPreparedStatement(CHAR_INS_ARENA_LOG_MEMBERSTATS);
stmt->setUInt32(0, fightId); stmt3->setUInt32(0, fightId);
stmt->setUInt8(1, ++memberId); stmt3->setUInt8(1, ++memberId);
stmt->setString(2, itr->second.Name); stmt3->setString(2, itr->second.Name);
stmt->setUInt32(3, itr->second.Guid); stmt3->setUInt32(3, itr->second.Guid);
stmt->setUInt32(4, itr->second.ArenaTeamId); stmt3->setUInt32(4, itr->second.ArenaTeamId);
stmt->setUInt32(5, itr->second.Acc); stmt3->setUInt32(5, itr->second.Acc);
stmt->setString(6, itr->second.IP); stmt3->setString(6, itr->second.IP);
stmt->setUInt32(7, itr->second.DamageDone); stmt3->setUInt32(7, itr->second.DamageDone);
stmt->setUInt32(8, itr->second.HealingDone); stmt3->setUInt32(8, itr->second.HealingDone);
stmt->setUInt32(9, itr->second.KillingBlows); stmt3->setUInt32(9, itr->second.KillingBlows);
trans->Append(stmt); trans->Append(stmt3);
} }
CharacterDatabase.CommitTransaction(trans); CharacterDatabase.CommitTransaction(trans);

2
src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
View File

@@ -6,8 +6,6 @@
#include "BattlegroundRL.h" #include "BattlegroundRL.h"
#include "Language.h" #include "Language.h"
#include "Object.h"
#include "ObjectMgr.h"
#include "Player.h" #include "Player.h"
#include "WorldPacket.h" #include "WorldPacket.h"
#include "WorldSession.h" #include "WorldSession.h"

12
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
View File

@@ -71,7 +71,7 @@ void BattlegroundRV::PostUpdateImpl(uint32 diff)
setTimer(BG_RV_CLOSE_FIRE_TIMER); setTimer(BG_RV_CLOSE_FIRE_TIMER);
setState(BG_RV_STATE_CLOSE_FIRE); setState(BG_RV_STATE_CLOSE_FIRE);
for (BattlegroundPlayerMap::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr) for (auto itr = m_Players.begin(); itr != m_Players.end(); ++itr)
if (Player* player = itr->second) if (Player* player = itr->second)
{ {
// Demonic Circle Summon // Demonic Circle Summon
@@ -90,16 +90,16 @@ void BattlegroundRV::PostUpdateImpl(uint32 diff)
if (totem->GetPositionZ() < 28.0f) if (totem->GetPositionZ() < 28.0f)
TeleportUnitToNewZ(totem, 28.28f, true); TeleportUnitToNewZ(totem, 28.28f, true);
for (Unit::ControlSet::const_iterator itr = player->m_Controlled.begin(); itr != player->m_Controlled.end(); ++itr) for (auto itr2 = player->m_Controlled.begin(); itr2 != player->m_Controlled.end(); ++itr2)
{ {
if ((*itr)->GetPositionZ() < 28.0f) if ((*itr2)->GetPositionZ() < 28.0f)
TeleportUnitToNewZ((*itr), 28.28f, true); TeleportUnitToNewZ((*itr2), 28.28f, true);
// Xinef: override stay position // Xinef: override stay position
if (CharmInfo* charmInfo = (*itr)->GetCharmInfo()) if (CharmInfo* charmInfo = (*itr2)->GetCharmInfo())
if (charmInfo->IsAtStay()) if (charmInfo->IsAtStay())
{ {
(*itr)->StopMovingOnCurrentPos(); (*itr2)->StopMovingOnCurrentPos();
charmInfo->SaveStayPosition(false); charmInfo->SaveStayPosition(false);
} }
} }

29
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
View File

@@ -624,21 +624,28 @@ void BattlegroundSA::EventPlayerDamagedGO(Player* /*player*/, GameObject* go, ui
case BG_SA_BLUE_GATE: case BG_SA_BLUE_GATE:
case BG_SA_GREEN_GATE: case BG_SA_GREEN_GATE:
{ {
GameObject* go = nullptr; if (auto redGate = GetBGObject(BG_SA_RED_GATE))
if ((go = GetBGObject(BG_SA_RED_GATE))) {
go->SetDestructibleBuildingModifyState(true); redGate->SetDestructibleBuildingModifyState(true);
if ((go = GetBGObject(BG_SA_PURPLE_GATE))) }
go->SetDestructibleBuildingModifyState(true); if (auto purpleGate = GetBGObject(BG_SA_PURPLE_GATE))
{
purpleGate->SetDestructibleBuildingModifyState(true);
}
break; break;
} }
case BG_SA_RED_GATE: case BG_SA_RED_GATE:
case BG_SA_PURPLE_GATE: case BG_SA_PURPLE_GATE:
if (GameObject* go = GetBGObject(BG_SA_YELLOW_GATE)) if (auto yellowGate = GetBGObject(BG_SA_YELLOW_GATE))
go->SetDestructibleBuildingModifyState(true); {
yellowGate->SetDestructibleBuildingModifyState(true);
}
break; break;
case BG_SA_YELLOW_GATE: case BG_SA_YELLOW_GATE:
if (GameObject* go = GetBGObject(BG_SA_ANCIENT_GATE)) if (auto ancientGate = GetBGObject(BG_SA_ANCIENT_GATE))
go->SetDestructibleBuildingModifyState(true); {
ancientGate->SetDestructibleBuildingModifyState(true);
}
break; break;
} }
} }
@@ -876,7 +883,7 @@ void BattlegroundSA::EventPlayerClickedOnFlag(Player* Source, GameObject* gameOb
break; break;
default: default:
return; return;
}; }
} }
void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
@@ -996,7 +1003,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
default: default:
ABORT(); ABORT();
break; break;
}; }
} }
void BattlegroundSA::EventPlayerUsedGO(Player* Source, GameObject* object) void BattlegroundSA::EventPlayerUsedGO(Player* Source, GameObject* object)

1
src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
View File

@@ -4,7 +4,6 @@
#include "BattlegroundMgr.h" #include "BattlegroundMgr.h"
#include "BattlegroundWS.h" #include "BattlegroundWS.h"
#include "Creature.h"
#include "GameGraveyard.h" #include "GameGraveyard.h"
#include "GameObject.h" #include "GameObject.h"
#include "Language.h" #include "Language.h"

1
src/server/game/Combat/HostileRefManager.cpp
View File

@@ -4,7 +4,6 @@
* Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/> * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
*/ */
#include "DBCStructure.h"
#include "HostileRefManager.h" #include "HostileRefManager.h"
#include "SpellInfo.h" #include "SpellInfo.h"
#include "SpellMgr.h" #include "SpellMgr.h"

4
src/server/game/Conditions/ConditionMgr.cpp
View File

@@ -210,12 +210,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
} }
case CONDITION_NEAR_CREATURE: case CONDITION_NEAR_CREATURE:
{ {
condMeets = !!GetClosestCreatureWithEntry(object, ConditionValue1, (float)ConditionValue2, !ConditionValue3); condMeets = static_cast<bool>(GetClosestCreatureWithEntry(object, ConditionValue1, static_cast<float>(ConditionValue2),!ConditionValue3));
break; break;
} }
case CONDITION_NEAR_GAMEOBJECT: case CONDITION_NEAR_GAMEOBJECT:
{ {
condMeets = !!GetClosestGameObjectWithEntry(object, ConditionValue1, (float)ConditionValue2); condMeets = static_cast<bool>(GetClosestGameObjectWithEntry(object, ConditionValue1, static_cast<float>(ConditionValue2)));
break; break;
} }
case CONDITION_OBJECT_ENTRY_GUID: case CONDITION_OBJECT_ENTRY_GUID: