aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent-Michael <vincent_michael@gmx.de>2016-04-16 12:19:23 +0200
committerDDuarte <dnpd.dd@gmail.com>2016-04-16 16:52:23 +0100
commitfe90fdcba178d490c39299ae0339811744f30b8c (patch)
tree9c70db62b8aa62238ceefe9a613a1c2f419b68ad /src
parent41e776fe64e2072d165b990cc9e9d2bfdd698855 (diff)
Core: Removed Whitespaces
(cherry picked from commit 3cd19d3b30e9c22859303c5bb006998201b66e33) # Conflicts: # src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp # src/server/game/Handlers/NPCHandler.cpp # src/server/game/Server/Packets/ChatPackets.cpp # src/server/game/Server/Packets/NPCPackets.h # src/server/game/Server/Packets/PartyPackets.h # src/server/game/Server/Packets/PetPackets.cpp # src/server/game/Server/Packets/PetPackets.h # src/server/game/Server/Packets/TicketPackets.h # src/server/game/Server/Packets/VoicePackets.h # src/server/game/Server/Packets/WardenPackets.h # src/server/scripts/Commands/cs_cheat.cpp
Diffstat (limited to 'src')
-rw-r--r--src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp4
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp2
-rw-r--r--src/server/game/Movement/MotionMaster.cpp2
-rw-r--r--src/server/game/Movement/MotionMaster.h2
-rw-r--r--src/server/game/Scripting/ScriptReloadMgr.cpp6
5 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
index fd105c5b25f..17b104eb388 100644
--- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
+++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp
@@ -725,10 +725,10 @@ void AuctionBotSeller::SetPricesOfItem(ItemTemplate const* itemProto, SellerConf
if (sAuctionBotConfig->GetConfig(CONFIG_AHBOT_BUYPRICE_SELLER))
buyPrice = sellPrice;
-
+
float basePriceFloat = (buyPrice * stackCount * priceRatio) / (itemProto->Class == 6 ? 200.0f : static_cast<float>(itemProto->BuyCount)) / 100.0f;
float range = basePriceFloat * 0.04f;
-
+
buyp = static_cast<uint32>(frand(basePriceFloat - range, basePriceFloat + range) + 0.5f);
if (buyp == 0)
buyp = 1;
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index b7f05a7fefa..b9cc49a6ef6 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12789,7 +12789,7 @@ Unit* Creature::SelectVictim()
if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target))
{
- if(!IsFocusing())
+ if (!IsFocusing())
SetInFront(target);
return target;
}
diff --git a/src/server/game/Movement/MotionMaster.cpp b/src/server/game/Movement/MotionMaster.cpp
index b01ddcb060d..f27e47fba21 100644
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -312,7 +312,7 @@ void MotionMaster::MoveCloserAndStop(uint32 id, Unit* target, float distance)
float desty = _owner->GetPositionY() + distanceToTravel * std::sin(angle);
MovePoint(id, destx, desty, target->GetPositionZ());
}
- else
+ else
{
// we are already close enough. We just need to turn toward the target without changing position.
Movement::MoveSplineInit init(_owner);
diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
index 7d6d512e88d..005f10b44af 100644
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -173,7 +173,7 @@ class TC_GAME_API MotionMaster //: private std::stack<MovementGenerator *>
{ MovePoint(id, pos.m_positionX, pos.m_positionY, pos.m_positionZ, generatePath); }
void MovePoint(uint32 id, float x, float y, float z, bool generatePath = true);
- /* Makes the unit move toward the target until it is at a certain distance from it. The unit then stops.
+ /* Makes the unit move toward the target until it is at a certain distance from it. The unit then stops.
Only works in 2D.
This method doesn't account for any movement done by the target. in other words, it only works if the target is stationary.
*/
diff --git a/src/server/game/Scripting/ScriptReloadMgr.cpp b/src/server/game/Scripting/ScriptReloadMgr.cpp
index aac0e26f02b..abaae1f958b 100644
--- a/src/server/game/Scripting/ScriptReloadMgr.cpp
+++ b/src/server/game/Scripting/ScriptReloadMgr.cpp
@@ -984,7 +984,7 @@ private:
return;
}
-
+
// Find all source files of a changed script module and removes
// it from the changed source list, invoke the build afterwards.
bool rebuild_buildfiles;
@@ -1056,7 +1056,7 @@ private:
ASSERT(_build_job->IsValid(), "Invalid build job!");
// Retrieve the result
- auto const error = _build_job->GetProcess()->GetFutureResult().get();
+ auto const error = _build_job->GetProcess()->GetFutureResult().get();
if (terminate_early)
{
@@ -1144,7 +1144,7 @@ private:
TC_LOG_INFO("scripts.hotswap", "Rerunning CMake because there were sources added or removed...");
- _build_job->UpdateCurrentJob(BuildJobType::BUILD_JOB_RERUN_CMAKE,
+ _build_job->UpdateCurrentJob(BuildJobType::BUILD_JOB_RERUN_CMAKE,
InvokeAsyncCMakeCommand(BuiltInConfig::GetBuildDirectory()));
}