aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/scripts/world/item_scripts.cpp5
-rw-r--r--src/game/Map.cpp6
-rw-r--r--src/game/MapInstanced.cpp2
-rw-r--r--src/game/MapManager.cpp10
-rw-r--r--src/game/Player.cpp7
-rw-r--r--src/game/SpellEffects.cpp2
6 files changed, 15 insertions, 17 deletions
diff --git a/src/bindings/scripts/scripts/world/item_scripts.cpp b/src/bindings/scripts/scripts/world/item_scripts.cpp
index 04654be37b5..e1b3d96ed03 100644
--- a/src/bindings/scripts/scripts/world/item_scripts.cpp
+++ b/src/bindings/scripts/scripts/world/item_scripts.cpp
@@ -255,7 +255,7 @@ enum ePileFakeFur
};
bool ItemUse_item_pile_fake_furs(Player *pPlayer, Item *pItem, SpellCastTargets const &targets)
{
- GameObject* pGo;
+ GameObject *pGo;
if ((pGo = pPlayer->FindNearestGameObject(GO_CARIBOU_TRAP_1, 5.0f)) ||
(pGo = pPlayer->FindNearestGameObject(GO_CARIBOU_TRAP_2, 5.0f)) ||
(pGo = pPlayer->FindNearestGameObject(GO_CARIBOU_TRAP_3, 5.0f)) ||
@@ -276,7 +276,7 @@ bool ItemUse_item_pile_fake_furs(Player *pPlayer, Item *pItem, SpellCastTargets
return true;
float x, y, z;
pGo->GetClosePoint(x, y, z, pGo->GetObjectSize() / 3, 7.0f);
- pGo->SummonGameObject(GO_HIGH_QUALITY_FUR,pGo->GetPositionX(),pGo->GetPositionY(),pGo->GetPositionZ(),0,0,0,0,0,1000);
+ pGo->SummonGameObject(GO_HIGH_QUALITY_FUR, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, 0, 0, 0, 0, 1000);
if (TempSummon* summon = pPlayer->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, pGo->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000))
{
summon->SetVisibility(VISIBILITY_OFF);
@@ -284,6 +284,7 @@ bool ItemUse_item_pile_fake_furs(Player *pPlayer, Item *pItem, SpellCastTargets
summon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
}
}
+ return false;
}
void AddSC_item_scripts()
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index d45cdab6f0c..cd8e2d9c152 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -217,12 +217,12 @@ Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode, Map* _par
{
m_notifyTimer.SetInterval(IN_MILISECONDS/2);
- for (unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
+ for (uint8 idx = 0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
{
- for (unsigned int j=0; j < MAX_NUMBER_OF_GRIDS; ++j)
+ for (uint8 j = 0; j < MAX_NUMBER_OF_GRIDS; ++j)
{
//z code
- GridMaps[idx][j] =NULL;
+ GridMaps[idx][j] = NULL;
setNGrid(NULL, idx, j);
}
}
diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 28faf52bf19..c77e40cb8f9 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -40,9 +40,7 @@ void MapInstanced::InitVisibilityDistance()
return;
//initialize visibility distances for all instance copies
for (InstancedMaps::iterator i = m_InstancedMaps.begin(); i != m_InstancedMaps.end(); ++i)
- {
(*i).second->InitVisibilityDistance();
- }
}
void MapInstanced::Update(const uint32& t)
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 135be78310f..b414b00fcc9 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -79,7 +79,7 @@ MapManager::Initialize()
void MapManager::InitializeVisibilityDistanceInfo()
{
- for (MapMapType::iterator iter=i_maps.begin(); iter != i_maps.end(); ++iter)
+ for (MapMapType::iterator iter = i_maps.begin(); iter != i_maps.end(); ++iter)
(*iter).second->InitVisibilityDistance();
}
@@ -87,9 +87,9 @@ void MapManager::InitializeVisibilityDistanceInfo()
void MapManager::checkAndCorrectGridStatesArray()
{
bool ok = true;
- for (int i=0; i<MAX_GRID_STATE; i++)
+ for (uint8 i = 0; i < MAX_GRID_STATE; ++i)
{
- if(i_GridStates[i] != si_GridStates[i])
+ if (i_GridStates[i] != si_GridStates[i])
{
sLog.outError("MapManager::checkGridStates(), GridState: si_GridStates is currupt !!!");
ok = false;
@@ -104,9 +104,9 @@ void MapManager::checkAndCorrectGridStatesArray()
}
#endif
}
- if(!ok)
+ if (!ok)
++i_GridStateErrorCount;
- if(i_GridStateErrorCount > 2)
+ if (i_GridStateErrorCount > 2)
assert(false); // force a crash. Too many errors
}
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8018fcdcd6a..5cc3fbc8f74 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -5950,6 +5950,7 @@ void Player::SendMessageToSet(WorldPacket *data, bool self)
// we use World::GetMaxVisibleDistance() because i cannot see why not use a distance
// update: replaced by GetMap()->GetVisibilityDistance()
+
Trinity::MessageDistDeliverer notifier(this, data, GetMap()->GetVisibilityDistance());
VisitNearbyWorldObject(GetMap()->GetVisibilityDistance(), notifier);
}
@@ -19020,16 +19021,14 @@ bool Player::IsVisibleInGridForPlayer( Player const * pl ) const
// It seems in battleground everyone sees everyone, except the enemy-faction ghosts
if (InBattleGround())
{
- if (!(isAlive() || m_deathTimer > 0) && !IsFriendlyTo(pl) )
+ if (!(isAlive() || m_deathTimer > 0) && !IsFriendlyTo(pl))
return false;
return true;
}
// Live player see live player or dead player with not realized corpse
- if(pl->isAlive() || pl->m_deathTimer > 0)
- {
+ if (pl->isAlive() || pl->m_deathTimer > 0)
return isAlive() || m_deathTimer > 0;
- }
// Ghost see other friendly ghosts, that's for sure
if(!(isAlive() || m_deathTimer > 0) && IsFriendlyTo(pl))
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 538a945ee26..265319d6992 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -6017,7 +6017,7 @@ void Spell::EffectSanctuary(uint32 /*i*/)
if(!(*iter)->hasUnitState(UNIT_STAT_CASTING))
continue;
- for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; i++)
+ for (uint32 i = CURRENT_FIRST_NON_MELEE_SPELL; i < CURRENT_MAX_SPELL; ++i)
{
if((*iter)->GetCurrentSpell(i)
&& (*iter)->GetCurrentSpell(i)->m_targets.getUnitTargetGUID() == unitTarget->GetGUID())