araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-16 04:59:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core: Whitespace cleanup

Browse Source
This commit is contained in:
Vincent-Michael
2015-04-08 02:27:20 +02:00
parent 41a9ef55db
commit 20ab76a2cb
18 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/collision/Management/MMapManager.cpp
View File

@@ -534,7 +534,7 @@ namespace MMAP
}
}
}
if (!swaps.empty())
{
// for each of the calling unit's terrain swaps

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

@@ -812,7 +812,7 @@ void BattlefieldWG::FillInitialWorldStates(WorldPackets::WorldState::InitWorldSt
packet.Worldstates.emplace_back(uint32(BATTLEFIELD_WG_WORLD_STATE_ATTACKER), int32(GetAttackerTeam()));
packet.Worldstates.emplace_back(uint32(BATTLEFIELD_WG_WORLD_STATE_DEFENDER), int32(GetDefenderTeam()));
// Note: cleanup these two, their names look awkward
packet.Worldstates.emplace_back(uint32(BATTLEFIELD_WG_WORLD_STATE_ACTIVE), int32(IsWarTime() ? 0 : 1));
packet.Worldstates.emplace_back(uint32(BATTLEFIELD_WG_WORLD_STATE_ACTIVE), int32(IsWarTime() ? 0 : 1));
packet.Worldstates.emplace_back(uint32(BATTLEFIELD_WG_WORLD_STATE_SHOW_WORLDSTATE), int32(IsWarTime() ? 1 : 0));
for (uint32 i = 0; i < 2; ++i)

2
src/server/game/Entities/Creature/GossipDef.cpp
View File

@@ -334,7 +334,7 @@ void QuestMenu::ClearMenu()
void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string& Title, ObjectGuid npcGUID)
{
WorldPackets::Quest::QuestGiverQuestList questList;
questList.QuestGiverGUID = npcGUID;
questList.Greeting = Title;
questList.GreetEmoteDelay = eEmote._Delay;

2
src/server/game/Entities/Object/Object.cpp
View File

@@ -3346,7 +3346,7 @@ void WorldObject::RebuildWorldMapAreaSwaps()
// Clear all world map area swaps, will be rebuilt below
_worldMapAreaSwaps.clear();
// get ALL default terrain swaps, if we are using it (condition is true)
// get ALL default terrain swaps, if we are using it (condition is true)
// send the worldmaparea for it, to see swapped worldmaparea in client from other maps too, not just from our current
TerrainPhaseInfo defaults = sObjectMgr->GetDefaultTerrainSwapStore();
for (TerrainPhaseInfo::const_iterator itr = defaults.begin(); itr != defaults.end(); ++itr)

4
src/server/game/Server/Packets/BankPackets.cpp
View File

@@ -27,8 +27,8 @@ void WorldPackets::Bank::AutoBankItem::Read()
void WorldPackets::Bank::AutoStoreBankItem::Read()
{
_worldPacket >> Inv
>> Bag
_worldPacket >> Inv
>> Bag
>> Slot;
}

2
src/server/game/Server/Packets/BankPackets.h
View File

@@ -50,7 +50,7 @@ namespace WorldPackets
uint8 Bag = 0;
uint8 Slot = 0;
};
class BuyBankSlot final : public ClientPacket
{
public:

4
src/server/game/Server/Packets/QuestPackets.h
View File

@@ -427,10 +427,10 @@ namespace WorldPackets
uint8 Entry = 0;
};
struct GossipTextData
{
GossipTextData(uint32 questID, uint32 questType, uint32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
GossipTextData(uint32 questID, uint32 questType, uint32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
QuestID(questID), QuestType(questType), QuestLevel(questLevel), QuestFlags(questFlags), QuestFlagsEx(questFlagsEx), Repeatable(repeatable), QuestTitle(questTitle) { }
uint32 QuestID;
uint32 QuestType;

6
src/server/game/Server/Packets/TicketPackets.cpp
View File

@@ -113,7 +113,7 @@ void WorldPackets::Ticket::GMTicketCreate::Read()
_worldPacket >> ChatHistoryData.TextCount;
for (uint8 i = 0; i < ChatHistoryData.TextCount; ++i)
ChatHistoryData.Sent.push_back(_worldPacket.read<uint32>());
_worldPacket >> ChatHistoryData.DecompressedSize;
//Note: don't ask why, but it works...
@@ -184,7 +184,7 @@ void WorldPackets::Ticket::GMSurveySubmit::Read()
}
void WorldPackets::Ticket::SupportTicketSubmitBug::Read()
{
{
_worldPacket >> Header;
Note = _worldPacket.ReadString(_worldPacket.ReadBits(10));
}
@@ -313,7 +313,7 @@ void WorldPackets::Ticket::SupportTicketSubmitComplaint::Read()
_worldPacket >> ChatLog;
_worldPacket >> TargetCharacterGUID;
ComplaintType = _worldPacket.ReadBits(5);
uint16 noteLength = _worldPacket.ReadBits(10);
bool hasMailInfo = _worldPacket.ReadBit();
bool hasCalendarInfo = _worldPacket.ReadBit();

6
src/server/game/Support/SupportMgr.h
View File

@@ -110,7 +110,7 @@ public:
virtual void SetAssignedTo(ObjectGuid guid) { _assignedTo = guid; }
virtual void SetAssignedTo(ObjectGuid /*guid*/, bool /*isAdmin*/) { }
virtual void SetUnassigned() { _assignedTo.Clear(); }
void SetClosedBy(ObjectGuid value) { _closedBy = value; }
void SetClosedBy(ObjectGuid value) { _closedBy = value; }
void SetComment(std::string const& comment) { _comment = comment; }
void SetPosition(uint32 mapId, G3D::Vector3& pos)
{
@@ -137,7 +137,7 @@ protected:
ObjectGuid _assignedTo;
std::string _comment;
};
class GmTicket : public Ticket
{
@@ -206,7 +206,7 @@ public:
BugTicket();
BugTicket(Player* player);
~BugTicket();
std::string const& GetNote() const { return _note; }
void SetFacing(float facing) { _facing = facing; }

6
src/server/game/World/World.cpp
View File

@@ -1619,13 +1619,13 @@ void World::SetInitialWorldSettings()
TC_LOG_INFO("server.loading", "Loading Gameobject Data...");
sObjectMgr->LoadGameobjects();
TC_LOG_INFO("server.loading", "Loading GameObject Addon Data...");
sObjectMgr->LoadGameObjectAddons(); // must be after LoadGameObjectTemplate() and LoadGameobjects()
TC_LOG_INFO("server.loading", "Loading GameObject Quest Items...");
sObjectMgr->LoadGameObjectQuestItems();
TC_LOG_INFO("server.loading", "Loading Creature Quest Items...");
sObjectMgr->LoadCreatureQuestItems();

2
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -248,7 +248,7 @@ public:
if (status)
handler->PSendSysMessage(LANG_LIQUID_STATUS, liquidStatus.level, liquidStatus.depth_level, liquidStatus.entry, liquidStatus.type_flags, status);
if (!object->GetTerrainSwaps().empty())
{
std::stringstream ss;

2
src/server/scripts/Commands/cs_modify.cpp
View File

@@ -1281,7 +1281,7 @@ public:
Unit* target = handler->getSelectedUnit();
if (!target)
target = handler->GetSession()->GetPlayer();
target->SetInPhase(phase, true, !target->IsInPhase(phase));
if (target->GetTypeId() == TYPEID_PLAYER)

2
src/server/scripts/Commands/cs_ticket.cpp
View File

@@ -126,7 +126,7 @@ public:
static bool HandleTicketResetAllCommand(ChatHandler* handler, char const* /*args*/)
{
if (sSupportMgr->GetOpenTicketCount<GmTicket>() || sSupportMgr->GetOpenTicketCount<BugTicket>()
if (sSupportMgr->GetOpenTicketCount<GmTicket>() || sSupportMgr->GetOpenTicketCount<BugTicket>()
|| sSupportMgr->GetOpenTicketCount<ComplaintTicket>() || sSupportMgr->GetOpenTicketCount<SuggestionTicket>())
{
handler->SendSysMessage(LANG_COMMAND_TICKETPENDING);

2
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View File

@@ -50,7 +50,7 @@ enum Sylvanas
SAY_SUNSORROW_WHISPER = 0,
SOUND_CREDIT = 10896,
NPC_HIGHBORNE_LAMENTER = 21628,
NPC_HIGHBORNE_BUNNY = 21641,
NPC_AMBASSADOR_SUNSORROW = 16287,

4
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp
View File

@@ -89,7 +89,7 @@ class boss_volkhan : public CreatureScript
{
public:
boss_volkhan() : CreatureScript("boss_volkhan") { }
struct boss_volkhanAI : public BossAI
{
boss_volkhanAI(Creature* creature) : BossAI(creature, DATA_VOLKHAN)
@@ -104,7 +104,7 @@ public:
m_bCanShatterGolem = false;
m_uiDelay_Timer = 1000;
m_uiSummonPhase = 0;
GolemsShattered = 0;
GolemsShattered = 0;
m_uiHealthAmountModifier = 1;
}

2
src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp
View File

@@ -60,7 +60,7 @@ void OutdoorPvPTF::FillInitialWorldStates(WorldPackets::WorldState::InitWorldSta
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_TIME_MINUTES_FIRST_DIGIT), int32(first_digit));
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_TIME_MINUTES_SECOND_DIGIT), int32(second_digit));
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_TIME_HOURS), int32(hours_left));
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_DISPLAY_NEUTRAL), int32(m_IsLocked && !m_HordeTowersControlled && !m_AllianceTowersControlled));
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_DISPLAY_HORDE), int32(m_IsLocked && (m_HordeTowersControlled > m_AllianceTowersControlled)));
packet.Worldstates.emplace_back(uint32(TF_UI_LOCKED_DISPLAY_ALLIANCE), int32(m_IsLocked && (m_HordeTowersControlled < m_AllianceTowersControlled)));

2
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
View File

@@ -283,7 +283,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
{
boss_harbinger_skyriss_illusionAI(Creature* creature) : ScriptedAI(creature) { }
void Reset() override
void Reset() override
{
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
}

2
src/server/shared/Updater/UpdateFetcher.cpp
View File

@@ -158,7 +158,7 @@ uint32 UpdateFetcher::Update(bool const redundancyChecks, bool const allowRehash
{
LocaleFileStorage const available = GetFileList();
AppliedFileStorage applied = ReceiveAppliedFiles();
// Fill hash to name cache
HashToFileNameStorage hashToName;
for (auto entry : applied)