diff options
| -rw-r--r-- | sql/mangos.sql | 4 | ||||
| -rw-r--r-- | src/game/AchievementMgr.cpp | 6 | ||||
| -rw-r--r-- | src/game/Level3.cpp | 2 | ||||
| -rw-r--r-- | src/game/Map.h | 2 | ||||
| -rw-r--r-- | src/game/SpellEffects.cpp | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 61b2ca27181..bbee0ea9e35 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -2133,7 +2133,7 @@ UNLOCK TABLES; -- Table structure for table `locales_points_of_interest` -- -DROP TABLE IF EXISTS `locales_points_of_interest`; +DROP TABLE IF EXISTS `locales_points_of_interest`; CREATE TABLE `locales_points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `icon_name_loc1` text, @@ -12770,7 +12770,7 @@ UNLOCK TABLES; -- Table structure for table `points_of_interest` -- -DROP TABLE IF EXISTS `points_of_interest`; +DROP TABLE IF EXISTS `points_of_interest`; CREATE TABLE `points_of_interest` ( `entry` mediumint(8) unsigned NOT NULL default '0', `x` float NOT NULL default '0', 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) |