aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Creature/GossipDef.cpp6
-rw-r--r--src/server/game/Entities/Player/Player.cpp8
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp2
-rw-r--r--src/server/game/Handlers/SkillHandler.cpp4
-rw-r--r--src/server/game/Server/Packets/ItemPackets.h20
-rw-r--r--src/server/game/Server/Packets/QueryPackets.h2
-rw-r--r--src/server/game/Server/Packets/QuestPackets.h2
-rw-r--r--src/server/game/Server/Packets/TalentPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/TalentPackets.h4
-rw-r--r--src/server/scripts/Northrend/Nexus/Nexus/nexus.h8
-rw-r--r--src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp2
-rw-r--r--src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp2
-rw-r--r--src/tools/connection_patcher/Patches/Common.hpp2
-rw-r--r--src/tools/map_extractor/loadlib/loadlib.h2
-rw-r--r--src/tools/vmap4_extractor/vmapexport.cpp2
15 files changed, 34 insertions, 34 deletions
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index c7e1c833a5a..2b2de44a10d 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -521,12 +521,12 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
packet.Info.RewardMoneyDifficulty = quest->GetRewMoneyDifficulty();
packet.Info.RewardBonusMoney = quest->GetRewMoneyMaxLevel();
- packet.Info.RewardDisplaySpell = quest->GetRewDisplaySpell();
+ packet.Info.RewardDisplaySpell = quest->GetRewDisplaySpell();
packet.Info.RewardSpell = quest->GetRewSpell();
packet.Info.RewardHonor = quest->GetRewHonor();
packet.Info.RewardKillHonor = quest->GetRewKillHonor();
-
+
packet.Info.StartItem = quest->GetSrcItemId();
packet.Info.Flags = quest->GetFlags();
packet.Info.FlagsEx = quest->GetFlagsEx();
@@ -574,7 +574,7 @@ void PlayerMenu::SendQuestQueryResponse(Quest const* quest) const
packet.Info.AreaDescription = areaDescription;
packet.Info.QuestCompletionLog = questCompletionLog;
packet.Info.AllowableRaces = quest->GetAllowableRaces();
-
+
for (uint32 i = 0; i < quest->Objectives.size(); ++i)
{
packet.Info.Objectives.push_back(quest->Objectives[i]);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 241c0564655..bb0c754ad03 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -14594,7 +14594,7 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
// check for repeatable quests status reset
questStatusData.Status = QUEST_STATUS_INCOMPLETE;
-
+
questStatusData.ObjectiveData.resize(quest->Objectives.size(), 0);
GiveQuestSourceItem(quest);
@@ -15765,7 +15765,7 @@ void Player::AreaExploredOrEventHappens(uint32 questId)
/** @todo
This function was previously used for area triggers but now those are a part of quest objective system
Currently this function is used to complete quests with no objectives (needs verifying) so probably rename it?
-
+
QuestStatusData& q_status = m_QuestStatus[questId];
if (!q_status.Explored)
@@ -16328,14 +16328,14 @@ void Player::SendQuestReward(Quest const* quest, uint32 XP)
}
WorldPackets::Quest::QuestGiverQuestComplete packet;
-
+
packet.QuestID = questId;
packet.MoneyReward = moneyReward;
packet.XPReward = xp;
packet.SkillLineIDReward = quest->GetRewardSkillId();
packet.NumSkillUpsReward = quest->GetRewardSkillPoints();
packet.TalentReward = quest->GetBonusTalents();
-
+
// @todo fix these 3
packet.UseQuestReward = true;
packet.LaunchGossip = true;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 95dda7fb8f1..1a5c7ad64c5 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3631,7 +3631,7 @@ void ObjectMgr::LoadQuests()
// Load `quest_visual_effect` join table with quest_objectives because visual effects are based on objective ID (core stores objectives by their index in quest)
// 0 1 2 3 4 5
result = WorldDatabase.Query("SELECT v.ID, o.ID, o.QuestID, o.StorageIndex, v.Index, v.VisualEffect FROM quest_visual_effect AS v LEFT JOIN quest_objectives AS o ON v.ID = o.ID ORDER BY v.Index DESC");
-
+
if (!result)
{
TC_LOG_ERROR("server.loading", ">> Loaded 0 quest visual effects. DB table `quest_visual_effect` is empty.");
diff --git a/src/server/game/Handlers/SkillHandler.cpp b/src/server/game/Handlers/SkillHandler.cpp
index 278169c2d63..ff290962b58 100644
--- a/src/server/game/Handlers/SkillHandler.cpp
+++ b/src/server/game/Handlers/SkillHandler.cpp
@@ -36,7 +36,7 @@ void WorldSession::HandleLearnTalentOpcode(WorldPackets::Talent::LearnTalent& pa
if (_player->LearnTalent(talentId))
anythingLearned = true;
}
-
+
if (anythingLearned)
_player->SendTalentsInfoData();
}
@@ -94,7 +94,7 @@ void WorldSession::HandleUnlearnSkillOpcode(WorldPacket& recvData)
void WorldSession::HandleSetSpecializationOpcode(WorldPackets::Talent::SetSpecialization& packet)
{
Player* player = GetPlayer();
-
+
if (packet.SpecGroupIndex >= MAX_SPECIALIZATIONS)
{
TC_LOG_DEBUG("network", "WORLD: HandleSetSpecializationOpcode - specialization index %u out of range", packet.SpecGroupIndex);
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index 2445a9bc2df..d052659d329 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -63,58 +63,58 @@ namespace WorldPackets
ObjectGuid itemGUID2;
uint32 level;
};
-
+
class SplitItem final : public ClientPacket
{
public:
SplitItem(WorldPacket&& packet) : ClientPacket(CMSG_SPLIT_ITEM, std::move(packet)) { }
void Read() override;
-
+
uint8 srcbag, srcslot, dstbag, dstslot;
uint32 itemCount, count;
};
-
+
class SwapInvItem final : public ClientPacket
{
public:
SwapInvItem(WorldPacket&& packet) : ClientPacket(CMSG_SWAP_INV_ITEM, std::move(packet)) { }
void Read() override;
-
+
uint32 itemCount;
uint8 srcslot, dstslot;
};
-
+
class SwapItem final : public ClientPacket
{
public:
SwapItem(WorldPacket&& packet) : ClientPacket(CMSG_SWAP_ITEM, std::move(packet)) { }
void Read() override;
-
+
uint32 itemCount;
uint8 dstbag, dstslot, srcbag, srcslot;
};
-
+
class AutoEquipItem final : public ClientPacket
{
public:
AutoEquipItem(WorldPacket&& packet) : ClientPacket(CMSG_AUTOEQUIP_ITEM, std::move(packet)) { }
void Read() override;
-
+
uint32 itemCount;
uint8 srcbag, srcslot;
};
-
+
class DestroyItem final : public ClientPacket
{
public:
DestroyItem(WorldPacket&& packet) : ClientPacket(CMSG_DESTROY_ITEM, std::move(packet)) { }
void Read() override;
-
+
uint32 count;
uint8 bag, slot;
};
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index 7f4dbd77ab3..49e200fcafd 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -238,7 +238,7 @@ namespace WorldPackets
size_t GetDataSize() const
{
// [1..3] always empty '\0' '\0' '\0' '\0' QuestItems counter
- return sizeof(Type) + sizeof(DisplayID) + (Name->length() + (4 * 1)) + (IconName.size() + 1) + (CastBarCaption.size() + 1) + (UnkString.size() + 1) + sizeof(Data) + sizeof(Size) + sizeof(uint8) + (QuestItems.size() * sizeof(int32)) + sizeof(Expansion);
+ return sizeof(Type) + sizeof(DisplayID) + (Name->size() + (4 * 1)) + (IconName.size() + 1) + (CastBarCaption.size() + 1) + (UnkString.size() + 1) + sizeof(Data) + sizeof(Size) + sizeof(uint8) + (QuestItems.size() * sizeof(int32)) + sizeof(Expansion);
}
};
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 9aa77da47f4..674efe144c0 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -96,7 +96,7 @@ namespace WorldPackets
ObjectGuid QuestGiver;
int32 QuestID;
};
-
+
struct QuestInfoChoiceItem
{
int32 ItemID;
diff --git a/src/server/game/Server/Packets/TalentPackets.cpp b/src/server/game/Server/Packets/TalentPackets.cpp
index d340b476cf9..06653607d50 100644
--- a/src/server/game/Server/Packets/TalentPackets.cpp
+++ b/src/server/game/Server/Packets/TalentPackets.cpp
@@ -47,7 +47,7 @@ void WorldPackets::Talent::LearnTalent::Read()
{
uint32 count;
_worldPacket >> count;
-
+
for (uint32 i = 0; i < count; ++i)
{
uint16 talent;
diff --git a/src/server/game/Server/Packets/TalentPackets.h b/src/server/game/Server/Packets/TalentPackets.h
index 2bc8b3934a8..d087340560a 100644
--- a/src/server/game/Server/Packets/TalentPackets.h
+++ b/src/server/game/Server/Packets/TalentPackets.h
@@ -57,7 +57,7 @@ namespace WorldPackets
uint32 SpecGroupIndex = 0;
};
-
+
class LearnTalent final : public ClientPacket
{
public:
@@ -68,7 +68,7 @@ namespace WorldPackets
void Read() override;
std::vector<uint16> Talents;
-
+
};
}
}
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
index 9962b0c884d..d5509eb3b56 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
+++ b/src/server/scripts/Northrend/Nexus/Nexus/nexus.h
@@ -21,7 +21,7 @@
#define NexusScriptName "instance_nexus"
#define DataHeader "NEX"
-uint32 const EncounterCount = 4;
+uint32 const EncounterCount = 4;
enum DataTypes
{
@@ -39,14 +39,14 @@ enum CreatureIds
{
NPC_ANOMALUS = 26763,
NPC_KERISTRASZA = 26723,
-
+
// Alliance
NPC_ALLIANCE_BERSERKER = 26800,
NPC_ALLIANCE_RANGER = 26802,
NPC_ALLIANCE_CLERIC = 26805,
NPC_ALLIANCE_COMMANDER = 27949,
NPC_COMMANDER_STOUTBEARD = 26796,
-
+
// Horde
NPC_HORDE_BERSERKER = 26799,
NPC_HORDE_RANGER = 26801,
@@ -59,7 +59,7 @@ enum GameObjectIds
{
GO_ANOMALUS_CONTAINMET_SPHERE = 188527,
GO_ORMOROKS_CONTAINMET_SPHERE = 188528,
- GO_TELESTRAS_CONTAINMET_SPHERE = 188526
+ GO_TELESTRAS_CONTAINMET_SPHERE = 188526
};
#endif
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 86a19d16efb..e9ffba5ae91 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -197,7 +197,7 @@ public:
++_healthAmountModifier;
}
}
-
+
private:
uint32 _healthAmountModifier;
bool _isIntroDone;
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
index 794d3a490f6..dc7b07e30ec 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -43,7 +43,7 @@ class go_main_chambers_access_panel : public GameObjectScript
}
};
-ObjectData const gameObjectData[] =
+ObjectData const gameObjectData[] =
{
{ GO_ACCESS_PANEL_HYDRO, DATA_ACCESS_PANEL_HYDRO },
{ GO_ACCESS_PANEL_MEK, DATA_ACCESS_PANEL_MEK },
diff --git a/src/tools/connection_patcher/Patches/Common.hpp b/src/tools/connection_patcher/Patches/Common.hpp
index 9741e61f5a9..95840f20472 100644
--- a/src/tools/connection_patcher/Patches/Common.hpp
+++ b/src/tools/connection_patcher/Patches/Common.hpp
@@ -28,7 +28,7 @@ namespace Connection_Patcher
struct Common
{
static const std::vector<unsigned char> Portal() { return { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; }
- static const std::vector<unsigned char> Modulus()
+ static const std::vector<unsigned char> Modulus()
{
return
{
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 3110ad569ea..c88e6893348 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -101,7 +101,7 @@ public:
std::multimap<std::string, FileChunk*> chunks;
FileChunk* GetChunk(std::string const& name);
};
-
+
#pragma pack(pop)
#endif
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 7664e12375a..17de988f665 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -148,7 +148,7 @@ bool ExtractWmo()
std::getline(wmoList, str);
if (str.empty())
break;
-
+
wmos.insert(std::move(str));
}