aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2015-04-08 02:27:20 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2015-04-08 02:27:20 +0200
commit20ab76a2cb9c2697e0974abdb166e1db04ef20ef (patch)
tree839745a037211c68b720dda3212ae2cf28b25eaf /src/server/game
parent41a9ef55db85c82fa9673ff2801bd6d8f34a390e (diff)
Core: Whitespace cleanup
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Battlefield/Zones/BattlefieldWG.cpp2
-rw-r--r--src/server/game/Entities/Creature/GossipDef.cpp2
-rw-r--r--src/server/game/Entities/Object/Object.cpp2
-rw-r--r--src/server/game/Server/Packets/BankPackets.cpp4
-rw-r--r--src/server/game/Server/Packets/BankPackets.h2
-rw-r--r--src/server/game/Server/Packets/QuestPackets.h4
-rw-r--r--src/server/game/Server/Packets/TicketPackets.cpp6
-rw-r--r--src/server/game/Support/SupportMgr.h6
-rw-r--r--src/server/game/World/World.cpp6
9 files changed, 17 insertions, 17 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
index 9ba72bc29b1..fbd02d20ee5 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -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)
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index 2f8fa2959b4..2e52ad10641 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -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;
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 3fbe9fbf63a..99a8e7107fe 100644
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -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)
diff --git a/src/server/game/Server/Packets/BankPackets.cpp b/src/server/game/Server/Packets/BankPackets.cpp
index 0f6af30bed0..b6108d083c7 100644
--- a/src/server/game/Server/Packets/BankPackets.cpp
+++ b/src/server/game/Server/Packets/BankPackets.cpp
@@ -27,8 +27,8 @@ void WorldPackets::Bank::AutoBankItem::Read()
void WorldPackets::Bank::AutoStoreBankItem::Read()
{
- _worldPacket >> Inv
- >> Bag
+ _worldPacket >> Inv
+ >> Bag
>> Slot;
}
diff --git a/src/server/game/Server/Packets/BankPackets.h b/src/server/game/Server/Packets/BankPackets.h
index dc7883c3643..91599f501b3 100644
--- a/src/server/game/Server/Packets/BankPackets.h
+++ b/src/server/game/Server/Packets/BankPackets.h
@@ -50,7 +50,7 @@ namespace WorldPackets
uint8 Bag = 0;
uint8 Slot = 0;
};
-
+
class BuyBankSlot final : public ClientPacket
{
public:
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index fd6def07977..c5b6bacd9eb 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -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;
diff --git a/src/server/game/Server/Packets/TicketPackets.cpp b/src/server/game/Server/Packets/TicketPackets.cpp
index 70ef53551da..ba5725bfe23 100644
--- a/src/server/game/Server/Packets/TicketPackets.cpp
+++ b/src/server/game/Server/Packets/TicketPackets.cpp
@@ -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();
diff --git a/src/server/game/Support/SupportMgr.h b/src/server/game/Support/SupportMgr.h
index fbaf75753d5..b3a7b2e24f0 100644
--- a/src/server/game/Support/SupportMgr.h
+++ b/src/server/game/Support/SupportMgr.h
@@ -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; }
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 3a38acae452..c22bc214666 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -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();