aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game')
-rwxr-xr-xsrc/server/game/AI/CreatureAI.h4
-rwxr-xr-xsrc/server/game/Entities/Item/Container/Bag.cpp2
-rwxr-xr-xsrc/server/game/Entities/Object/Object.cpp10
-rwxr-xr-xsrc/server/game/Maps/Map.cpp8
-rwxr-xr-xsrc/server/game/Maps/Map.h6
-rwxr-xr-xsrc/server/game/Maps/MapManager.cpp4
-rwxr-xr-xsrc/server/game/OutdoorPvP/OutdoorPvP.h2
-rwxr-xr-xsrc/server/game/Server/WorldSession.h2
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuraEffects.cpp2
-rwxr-xr-xsrc/server/game/Spells/SpellScript.h4
10 files changed, 22 insertions, 22 deletions
diff --git a/src/server/game/AI/CreatureAI.h b/src/server/game/AI/CreatureAI.h
index 2e4e00aa7c9..662ed3ab3dd 100755
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@@ -142,7 +142,7 @@ class CreatureAI : public UnitAI
// Called when creature attack expected (if creature can and no have current victim)
// Note: for reaction at hostile action must be called AttackedBy function.
- //virtual void AttackStart(Unit* ) {}
+ //virtual void AttackStart(Unit*) {}
// Called at World update tick
//virtual void UpdateAI(const uint32 /*diff*/) {}
@@ -150,7 +150,7 @@ class CreatureAI : public UnitAI
/// == State checks =================================
// Is unit visible for MoveInLineOfSight
- //virtual bool IsVisible(Unit* ) const { return false; }
+ //virtual bool IsVisible(Unit*) const { return false; }
// called when the corpse of this creature gets removed
virtual void CorpseRemoved(uint32& /*respawnDelay*/) {}
diff --git a/src/server/game/Entities/Item/Container/Bag.cpp b/src/server/game/Entities/Item/Container/Bag.cpp
index 92abc595e77..c6c00820463 100755
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@@ -31,7 +31,7 @@ Bag::Bag(): Item()
m_valuesCount = CONTAINER_END;
- memset(m_bagslot, 0, sizeof(Item* ) * MAX_BAG_SIZE);
+ memset(m_bagslot, 0, sizeof(Item*) * MAX_BAG_SIZE);
}
Bag::~Bag()
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
index 8bd464a4820..7413ff221f1 100755
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@@ -414,14 +414,14 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags) const
*data << (float)0;
*data << (float)0;
*data << (float)0;
- *data << ((WorldObject* )this)->GetOrientation();
+ *data << ((WorldObject*)this)->GetOrientation();
}
else
{
- *data << ((WorldObject* )this)->GetPositionX();
- *data << ((WorldObject* )this)->GetPositionY();
- *data << ((WorldObject* )this)->GetPositionZ();
- *data << ((WorldObject* )this)->GetOrientation();
+ *data << ((WorldObject*)this)->GetPositionX();
+ *data << ((WorldObject*)this)->GetPositionY();
+ *data << ((WorldObject*)this)->GetPositionZ();
+ *data << ((WorldObject*)this)->GetOrientation();
}
}
}
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index c81eb8b61b0..5dcce67bcd3 100755
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -2176,10 +2176,10 @@ void Map::RemoveFromActive(Creature* c)
}
}
-template void Map::Add(Corpse* );
-template void Map::Add(Creature* );
-template void Map::Add(GameObject* );
-template void Map::Add(DynamicObject* );
+template void Map::Add(Corpse*);
+template void Map::Add(Creature*);
+template void Map::Add(GameObject*);
+template void Map::Add(DynamicObject*);
template void Map::Remove(Corpse* , bool);
template void Map::Remove(Creature* , bool);
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 385f7abcaa5..081516bb338 100755
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -254,7 +254,7 @@ class Map : public GridRefManager<NGridType>
return false;
}
- virtual bool Add(Player* );
+ virtual bool Add(Player*);
virtual void Remove(Player* , bool);
template<class T> void Add(T *);
template<class T> void Remove(T *, bool);
@@ -577,7 +577,7 @@ class InstanceMap : public Map
public:
InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent);
~InstanceMap();
- bool Add(Player* );
+ bool Add(Player*);
void Remove(Player* , bool);
void Update(const uint32);
void CreateInstanceData(bool load);
@@ -607,7 +607,7 @@ class BattlegroundMap : public Map
BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode);
~BattlegroundMap();
- bool Add(Player* );
+ bool Add(Player*);
void Remove(Player* , bool);
bool CanEnter(Player* player);
void SetUnload();
diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp
index 0b9528e5760..4684e96c79c 100755
--- a/src/server/game/Maps/MapManager.cpp
+++ b/src/server/game/Maps/MapManager.cpp
@@ -343,7 +343,7 @@ uint32 MapManager::GetNumInstances()
Map* map = itr->second;
if (!map->Instanceable())
continue;
- MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps();
+ MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
if (mitr->second->IsDungeon()) ret++;
}
@@ -360,7 +360,7 @@ uint32 MapManager::GetNumPlayersInInstances()
Map* map = itr->second;
if (!map->Instanceable())
continue;
- MapInstanced::InstancedMaps &maps = ((MapInstanced* )map)->GetInstancedMaps();
+ MapInstanced::InstancedMaps &maps = ((MapInstanced*)map)->GetInstancedMaps();
for (MapInstanced::InstancedMaps::iterator mitr = maps.begin(); mitr != maps.end(); ++mitr)
if (mitr->second->IsDungeon())
ret += ((InstanceMap*)mitr->second)->GetPlayers().getSize();
diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
index 8924ce8acbb..3b1a2041515 100755
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -221,7 +221,7 @@ class OutdoorPvP : public ZoneScript
void OnGameObjectCreate(GameObject* go);
void OnGameObjectRemove(GameObject* go);
- void OnCreatureCreate(Creature* ) {}
+ void OnCreatureCreate(Creature*) {}
// send world state update to all players present
void SendUpdateWorldState(uint32 field, uint32 value);
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index 8e489b7ea50..d7125bfe0f4 100755
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -145,7 +145,7 @@ public:
explicit PacketFilter(WorldSession* pSession) : m_pSession(pSession) {}
virtual ~PacketFilter() {}
- virtual bool Process(WorldPacket* /*packet*/) { return true; }
+ virtual bool Process(WorldPacket* /*packet*/) { return true; }
virtual bool ProcessLogout() const { return true; }
protected:
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index ccd7b8da79f..fae94236c17 100755
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -5653,7 +5653,7 @@ void AuraEffect::HandlePeriodicDummyAuraTick(Unit* target, Unit* caster) const
// Mirror Image
if (GetId() == 55342)
// Set name of summons to name of caster
- target->CastSpell((Unit* )NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true);
+ target->CastSpell((Unit*)NULL, m_spellInfo->Effects[m_effIndex].TriggerSpell, true);
break;
}
case SPELLFAMILY_WARLOCK:
diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h
index af814798a3a..15b22097f2d 100755
--- a/src/server/game/Spells/SpellScript.h
+++ b/src/server/game/Spells/SpellScript.h
@@ -375,8 +375,8 @@ class AuraScript : public _SpellScript
#define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \
typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \
typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const* , AuraEffectHandleModes); \
- typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const* ); \
- typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect* ); \
+ typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const*); \
+ typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect*); \
typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const* , int32 &, bool &); \
typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const* , bool &, int32 &); \
typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const* , SpellModifier* &); \