aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-04-03 16:39:21 -0600
committermegamage <none@none>2009-04-03 16:39:21 -0600
commit3d1200f4ac8adc439d5580cb9fdea6f827d4e9d9 (patch)
tree4d311806c040a77dd2eaf7f63e7b2815048b93d7 /src
parentdf479707e2b96ff292a58f0af594a6f26f9bfd72 (diff)
[7609] Trailing whitespace cleaning Author: freghar
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/AchievementMgr.cpp6
-rw-r--r--src/game/Level3.cpp2
-rw-r--r--src/game/Map.h2
-rw-r--r--src/game/SpellEffects.cpp2
-rw-r--r--src/game/Unit.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 8123a60fe84..37041c7d7da 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -1185,17 +1185,17 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
{
case PROGRESS_SET:
newValue = changeValue;
- break;
+ break;
case PROGRESS_ACCUMULATE:
{
// avoid overflow
uint32 max_value = std::numeric_limits<uint32>::max();
newValue = max_value - progress->counter > changeValue ? progress->counter + changeValue : max_value;
- break;
+ break;
}
case PROGRESS_HIGHEST:
newValue = progress->counter < changeValue ? changeValue : progress->counter;
- break;
+ break;
}
// not update (not mark as changed) if counter will have same value
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index e1dd468158e..075b41ca743 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -2299,7 +2299,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/)
// search highest talent rank
uint32 spellid = 0;
-
+
for(int rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{
if(talentInfo->RankID[rank]!=0)
diff --git a/src/game/Map.h b/src/game/Map.h
index 64b93399fdc..89d1ad2a6c3 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -181,7 +181,7 @@ class GridMap
bool loadLiquidData(FILE *in, uint32 offset, uint32 size);
// Get height functions and pointers
- typedef float (GridMap::*pGetHeightPtr) (float x, float y) const;
+ typedef float (GridMap::*pGetHeightPtr) (float x, float y) const;
pGetHeightPtr m_gridGetHeight;
float getHeightFromFloat(float x, float y) const;
float getHeightFromUint16(float x, float y) const;
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 051b4f1775c..2dec5a2760c 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -2473,7 +2473,7 @@ void Spell::EffectPowerBurn(uint32 i)
{
uint32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100;
damage = unitTarget->GetMaxPower(powertype) * damage / 100;
- if(damage > maxdamage) damage = maxdamage;
+ if(damage > maxdamage) damage = maxdamage;
}
int32 curPower = int32(unitTarget->GetPower(powertype));
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index f9dfc24fac6..39daf01415a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11946,7 +11946,7 @@ Player* Unit::GetSpellModOwner() const
void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
{
if(msg == SPELL_CAST_OK)
- return;
+ return;
Unit *owner = GetCharmerOrOwner();
if(!owner || owner->GetTypeId() != TYPEID_PLAYER)