josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Removed passing of integer types by const reference where possible

Browse Source
This commit is contained in:
Spp
2012-11-12 15:27:01 +01:00
parent 16d9d1e56d
commit 49c250f3c5
18 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/GameObjectAI.h
+2 -2
View File
@@ -37,11 +37,11 @@ class GameObjectAI
virtual void InitializeAI() { Reset(); }
virtual void Reset() {};
virtual void Reset() { }
// Pass parameters between AI
virtual void DoAction(const int32 /*param = 0 */) {}
virtual void SetGUID(const uint64& /*guid*/, int32 /*id = 0 */) {}
virtual void SetGUID(uint64 /*guid*/, int32 /*id = 0 */) {}
virtual uint64 GetGUID(int32 /*id = 0 */) { return 0; }
static int Permissible(GameObject const* go);
src/server/game/Battlefield/Battlefield.cpp
+1 -1
View File
@@ -659,7 +659,7 @@ void Battlefield::RemovePlayerFromResurrectQueue(uint64 playerGuid)
}
}
void Battlefield::SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 &guid)
void Battlefield::SendAreaSpiritHealerQueryOpcode(Player* player, uint64 guid)
{
WorldPacket data(SMSG_AREA_SPIRIT_HEALER_TIME, 12);
uint32 time = m_LastResurectTimer; // resurrect every 30 seconds
src/server/game/Battlefield/Battlefield.h
+9 -9
View File
@@ -304,19 +304,19 @@ class Battlefield : public ZoneScript
// Script-methods
/// Called on start
virtual void OnBattleStart() {};
virtual void OnBattleStart() { }
/// Called at the end of battle
virtual void OnBattleEnd(bool /*endByTimer*/) {};
virtual void OnBattleEnd(bool /*endByTimer*/) { }
/// Called x minutes before battle start when player in zone are invite to join queue
virtual void OnStartGrouping() {};
virtual void OnStartGrouping() { }
/// Called when a player accept to join the battle
virtual void OnPlayerJoinWar(Player* /*player*/) {};
virtual void OnPlayerJoinWar(Player* /*player*/) { }
/// Called when a player leave the battle
virtual void OnPlayerLeaveWar(Player* /*player*/) {};
virtual void OnPlayerLeaveWar(Player* /*player*/) { }
/// Called when a player leave battlefield zone
virtual void OnPlayerLeaveZone(Player* /*player*/) {};
virtual void OnPlayerLeaveZone(Player* /*player*/) { }
/// Called when a player enter in battlefield zone
virtual void OnPlayerEnterZone(Player* /*player*/) {};
virtual void OnPlayerEnterZone(Player* /*player*/) { }
WorldPacket BuildWarningAnnPacket(std::string const& msg);
void SendWarningToAllInZone(uint32 entry);
@@ -328,7 +328,7 @@ class Battlefield : public ZoneScript
uint32 GetBattleId() { return m_BattleId; }
void AskToLeaveQueue(Player* player);
virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) {};
virtual void DoCompleteOrIncrementAchievement(uint32 /*achievement*/, Player* /*player*/, uint8 /*incrementNumber = 1*/) { }
/// Send all worldstate data to all player in zone.
virtual void SendInitWorldStatesToAll() = 0;
@@ -337,7 +337,7 @@ class Battlefield : public ZoneScript
/// Return if we can use mount in battlefield
bool CanFlyIn() { return !m_isActive; }
void SendAreaSpiritHealerQueryOpcode(Player* player, const uint64 & guid);
void SendAreaSpiritHealerQueryOpcode(Player* player, uint64 guid);
void StartBattle();
void EndBattle(bool endByTimer);
src/server/game/Globals/ObjectMgr.cpp
+2 -2
View File
@@ -6190,7 +6190,7 @@ inline void CheckGOSpellId(GameObjectTemplate const* goInfo, uint32 dataN, uint3
goInfo->entry, goInfo->type, N, dataN, dataN);
}
inline void CheckAndFixGOChairHeightId(GameObjectTemplate const* goInfo, uint32 const& dataN, uint32 N)
inline void CheckAndFixGOChairHeightId(GameObjectTemplate const* goInfo, uint32& dataN, uint32 N)
{
if (dataN <= (UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR))
return;
@@ -6199,7 +6199,7 @@ inline void CheckAndFixGOChairHeightId(GameObjectTemplate const* goInfo, uint32
goInfo->entry, goInfo->type, N, dataN, UNIT_STAND_STATE_SIT_HIGH_CHAIR-UNIT_STAND_STATE_SIT_LOW_CHAIR);
// prevent client and server unexpected work
const_cast<uint32&>(dataN) = 0;
dataN = 0;
}
inline void CheckGONoDamageImmuneId(GameObjectTemplate* goTemplate, uint32 dataN, uint32 N)
src/server/game/Miscellaneous/SharedDefines.h
+4 -4
View File
@@ -534,7 +534,7 @@ enum SpellAttr7
SPELL_ATTR7_REACTIVATE_AT_RESURRECT = 0x00000004, // 2 Paladin's auras and 65607 only.
SPELL_ATTR7_IS_CHEAT_SPELL = 0x00000008, // 3 Cannot cast if caster doesn't have UnitFlag2 & UNIT_FLAG2_ALLOW_CHEAT_SPELLS
SPELL_ATTR7_UNK4 = 0x00000010, // 4 Only 47883 (Soulstone Resurrection) and test spell.
SPELL_ATTR7_SUMMON_TOTEM = 0x00000020, // 5 Only Shaman player totems.
SPELL_ATTR7_SUMMON_TOTEM = 0x00000020, // 5 Only Shaman totems.
SPELL_ATTR7_UNK6 = 0x00000040, // 6 Dark Surge, Surge of Light, Burning Breath triggers (boss spells).
SPELL_ATTR7_UNK7 = 0x00000080, // 7 66218 (Launch) spell.
SPELL_ATTR7_HORDE_ONLY = 0x00000100, // 8 Teleports, mounts and other spells.
@@ -565,7 +565,7 @@ enum SpellAttr7
enum SpellAttr8
{
SPELL_ATTR8_UNK0 = 0x00000001, // 0
SPELL_ATTR8_CANT_MISS = 0x00000001, // 0
SPELL_ATTR8_UNK1 = 0x00000002, // 1
SPELL_ATTR8_UNK2 = 0x00000004, // 2
SPELL_ATTR8_UNK3 = 0x00000008, // 3
@@ -593,7 +593,7 @@ enum SpellAttr8
SPELL_ATTR8_UNK25 = 0x02000000, // 25
SPELL_ATTR8_RAID_MARKER = 0x04000000, // 26 probably spell no need learn to cast
SPELL_ATTR8_UNK27 = 0x08000000, // 27
SPELL_ATTR8_GUILD_PERKS = 0x10000000, // 28
SPELL_ATTR8_NOT_IN_BG_OR_ARENA = 0x10000000, // 28 not allow to cast or deactivate currently active effect, not sure about Fast Track
SPELL_ATTR8_MASTERY = 0x20000000, // 29
SPELL_ATTR8_UNK30 = 0x40000000, // 30
SPELL_ATTR8_UNK31 = 0x80000000 // 31
@@ -605,7 +605,7 @@ enum SpellAttr9
SPELL_ATTR9_UNK1 = 0x00000002, // 1
SPELL_ATTR9_RESTRICTED_FLIGHT_AREA = 0x00000004, // 2 Dalaran and Wintergrasp flight area auras have it
SPELL_ATTR9_UNK3 = 0x00000008, // 3
SPELL_ATTR9_UNK4 = 0x00000010, // 4
SPELL_ATTR9_SPECIAL_DELAY_CALCULATION = 0x00000010, // 4
SPELL_ATTR9_SUMMON_PLAYER_TOTEM = 0x00000020, // 5
SPELL_ATTR9_UNK6 = 0x00000040, // 6
SPELL_ATTR9_UNK7 = 0x00000080, // 7
src/server/game/Movement/MovementGenerator.h
+2 -2
View File
@@ -38,7 +38,7 @@ class MovementGenerator
virtual void Reset(Unit &) = 0;
virtual bool Update(Unit &, const uint32& time_diff) = 0;
virtual bool Update(Unit &, uint32 time_diff) = 0;
virtual MovementGeneratorType GetMovementGeneratorType() = 0;
@@ -64,7 +64,7 @@ class MovementGeneratorMedium : public MovementGenerator
//u->AssertIsType<T>();
(static_cast<D*>(this))->DoReset(*((T*)&u));
}
bool Update(Unit &u, const uint32& time_diff)
bool Update(Unit &u, uint32 time_diff)
{
//u->AssertIsType<T>();
return (static_cast<D*>(this))->DoUpdate(*((T*)&u), time_diff);
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ void ConfusedMovementGenerator<T>::DoReset(T &unit)
}
template<class T>
bool ConfusedMovementGenerator<T>::DoUpdate(T &unit, const uint32 &diff)
bool ConfusedMovementGenerator<T>::DoUpdate(T &unit, uint32 diff)
{
if (unit.HasUnitState(UNIT_STATE_ROOT | UNIT_STATE_STUNNED | UNIT_STATE_DISTRACTED))
return true;
@@ -168,6 +168,6 @@ template void ConfusedMovementGenerator<Player>::DoInitialize(Player &player);
template void ConfusedMovementGenerator<Creature>::DoInitialize(Creature &creature);
template void ConfusedMovementGenerator<Player>::DoReset(Player &player);
template void ConfusedMovementGenerator<Creature>::DoReset(Creature &creature);
template bool ConfusedMovementGenerator<Player>::DoUpdate(Player &player, const uint32 &diff);
template bool ConfusedMovementGenerator<Creature>::DoUpdate(Creature &creature, const uint32 &diff);
template bool ConfusedMovementGenerator<Player>::DoUpdate(Player &player, uint32 diff);
template bool ConfusedMovementGenerator<Creature>::DoUpdate(Creature &creature, uint32 diff);
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
+1 -1
View File
@@ -33,7 +33,7 @@ class ConfusedMovementGenerator : public MovementGeneratorMedium< T, ConfusedMov
void DoInitialize(T &);
void DoFinalize(T &);
void DoReset(T &);
bool DoUpdate(T &, const uint32 &);
bool DoUpdate(T &, uint32);
MovementGeneratorType GetMovementGeneratorType() { return CONFUSED_MOTION_TYPE; }
private:
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+5 -5
View File
@@ -354,7 +354,7 @@ void FleeingMovementGenerator<T>::DoReset(T &owner)
}
template<class T>
bool FleeingMovementGenerator<T>::DoUpdate(T &owner, const uint32 &time_diff)
bool FleeingMovementGenerator<T>::DoUpdate(T &owner, uint32 time_diff)
{
if (!&owner || !owner.isAlive())
return false;
@@ -381,8 +381,8 @@ template void FleeingMovementGenerator<Player>::_setTargetLocation(Player &);
template void FleeingMovementGenerator<Creature>::_setTargetLocation(Creature &);
template void FleeingMovementGenerator<Player>::DoReset(Player &);
template void FleeingMovementGenerator<Creature>::DoReset(Creature &);
template bool FleeingMovementGenerator<Player>::DoUpdate(Player &, const uint32 &);
template bool FleeingMovementGenerator<Creature>::DoUpdate(Creature &, const uint32 &);
template bool FleeingMovementGenerator<Player>::DoUpdate(Player &, uint32);
template bool FleeingMovementGenerator<Creature>::DoUpdate(Creature &, uint32);
void TimedFleeingMovementGenerator::Finalize(Unit &owner)
{
@@ -398,7 +398,7 @@ void TimedFleeingMovementGenerator::Finalize(Unit &owner)
}
}
bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32& time_diff)
bool TimedFleeingMovementGenerator::Update(Unit & owner, uint32 time_diff)
{
if (!owner.isAlive())
return false;
@@ -413,7 +413,7 @@ bool TimedFleeingMovementGenerator::Update(Unit & owner, const uint32& time_diff
if (i_totalFleeTime.Passed())
return false;
// This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, const uint32 &) version
// This calls grant-parent Update method hiden by FleeingMovementGenerator::Update(Creature &, uint32) version
// This is done instead of casting Unit& to Creature& and call parent method, then we can use Unit directly
return MovementGeneratorMedium< Creature, FleeingMovementGenerator<Creature> >::Update(owner, time_diff);
}
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
+2 -2
View File
@@ -30,7 +30,7 @@ class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovem
void DoInitialize(T &);
void DoFinalize(T &);
void DoReset(T &);
bool DoUpdate(T &, const uint32 &);
bool DoUpdate(T &, uint32);
MovementGeneratorType GetMovementGeneratorType() { return FLEEING_MOTION_TYPE; }
@@ -62,7 +62,7 @@ class TimedFleeingMovementGenerator : public FleeingMovementGenerator<Creature>
i_totalFleeTime(time) {}
MovementGeneratorType GetMovementGeneratorType() { return TIMED_FLEEING_MOTION_TYPE; }
bool Update(Unit &, const uint32&);
bool Update(Unit &, uint32);
void Finalize(Unit &);
private:
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ void RotateMovementGenerator::Initialize(Unit& owner)
owner.AttackStop();
}
bool RotateMovementGenerator::Update(Unit& owner, const uint32& diff)
bool RotateMovementGenerator::Update(Unit& owner, uint32 diff)
{
float angle = owner.GetOrientation();
if (m_direction == ROTATE_DIRECTION_LEFT)
@@ -89,7 +89,7 @@ void DistractMovementGenerator::Finalize(Unit& owner)
owner.ClearUnitState(UNIT_STATE_DISTRACTED);
}
bool DistractMovementGenerator::Update(Unit& /*owner*/, const uint32& time_diff)
bool DistractMovementGenerator::Update(Unit& /*owner*/, uint32 time_diff)
{
if (time_diff > m_timer)
return false;
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
+3 -3
View File
@@ -28,7 +28,7 @@ class IdleMovementGenerator : public MovementGenerator
void Initialize(Unit &);
void Finalize(Unit &) { }
void Reset(Unit &);
bool Update(Unit &, const uint32&) { return true; }
bool Update(Unit &, uint32) { return true; }
MovementGeneratorType GetMovementGeneratorType() { return IDLE_MOTION_TYPE; }
};
@@ -42,7 +42,7 @@ class RotateMovementGenerator : public MovementGenerator
void Initialize(Unit& owner);
void Finalize(Unit& owner);
void Reset(Unit& owner) { Initialize(owner); }
bool Update(Unit& owner, const uint32& time_diff);
bool Update(Unit& owner, uint32 time_diff);
MovementGeneratorType GetMovementGeneratorType() { return ROTATE_MOTION_TYPE; }
private:
@@ -58,7 +58,7 @@ class DistractMovementGenerator : public MovementGenerator
void Initialize(Unit& owner);
void Finalize(Unit& owner);
void Reset(Unit& owner) { Initialize(owner); }
bool Update(Unit& owner, const uint32& time_diff);
bool Update(Unit& owner, uint32 time_diff);
MovementGeneratorType GetMovementGeneratorType() { return DISTRACT_MOTION_TYPE; }
private:
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
+4 -4
View File
@@ -42,7 +42,7 @@ void PointMovementGenerator<T>::DoInitialize(T &unit)
}
template<class T>
bool PointMovementGenerator<T>::DoUpdate(T &unit, const uint32 & /*diff*/)
bool PointMovementGenerator<T>::DoUpdate(T &unit, uint32 /*diff*/)
{
if (!&unit)
return false;
@@ -103,8 +103,8 @@ template void PointMovementGenerator<Player>::DoFinalize(Player&);
template void PointMovementGenerator<Creature>::DoFinalize(Creature&);
template void PointMovementGenerator<Player>::DoReset(Player&);
template void PointMovementGenerator<Creature>::DoReset(Creature&);
template bool PointMovementGenerator<Player>::DoUpdate(Player &, const uint32 &);
template bool PointMovementGenerator<Creature>::DoUpdate(Creature&, const uint32 &);
template bool PointMovementGenerator<Player>::DoUpdate(Player &, uint32);
template bool PointMovementGenerator<Creature>::DoUpdate(Creature&, uint32);
void AssistanceMovementGenerator::Finalize(Unit &unit)
{
@@ -114,7 +114,7 @@ void AssistanceMovementGenerator::Finalize(Unit &unit)
unit.GetMotionMaster()->MoveSeekAssistanceDistract(sWorld->getIntConfig(CONFIG_CREATURE_FAMILY_ASSISTANCE_DELAY));
}
bool EffectMovementGenerator::Update(Unit &unit, const uint32&)
bool EffectMovementGenerator::Update(Unit &unit, uint32)
{
return !unit.movespline->Finalized();
}
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
+2 -2
View File
@@ -32,7 +32,7 @@ class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementG
void DoInitialize(T &);
void DoFinalize(T &);
void DoReset(T &);
bool DoUpdate(T &, const uint32 &);
bool DoUpdate(T &, uint32);
void MovementInform(T &);
@@ -66,7 +66,7 @@ class EffectMovementGenerator : public MovementGenerator
void Initialize(Unit &) {}
void Finalize(Unit &unit);
void Reset(Unit &) {}
bool Update(Unit &u, const uint32&);
bool Update(Unit &u, uint32);
MovementGeneratorType GetMovementGeneratorType() { return EFFECT_MOTION_TYPE; }
private:
uint32 m_Id;
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+5 -5
View File
@@ -120,7 +120,7 @@ void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature>
}
template<class T, typename D>
bool TargetedMovementGeneratorMedium<T,D>::DoUpdate(T &owner, const uint32 & time_diff)
bool TargetedMovementGeneratorMedium<T,D>::DoUpdate(T &owner, uint32 time_diff)
{
if (!i_target.isValid() || !i_target->IsInWorld())
return false;
@@ -306,10 +306,10 @@ template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Play
template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player &);
template void TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::_setTargetLocation(Creature &);
template void TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::_setTargetLocation(Creature &);
template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::DoUpdate(Player &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::DoUpdate(Player &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::DoUpdate(Creature &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::DoUpdate(Creature &, const uint32 &);
template bool TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::DoUpdate(Player &, uint32);
template bool TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::DoUpdate(Player &, uint32);
template bool TargetedMovementGeneratorMedium<Creature,ChaseMovementGenerator<Creature> >::DoUpdate(Creature &, uint32);
template bool TargetedMovementGeneratorMedium<Creature,FollowMovementGenerator<Creature> >::DoUpdate(Creature &, uint32);
template void ChaseMovementGenerator<Player>::_reachTarget(Player &);
template void ChaseMovementGenerator<Creature>::_reachTarget(Creature &);
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
+1 -1
View File
@@ -46,7 +46,7 @@ class TargetedMovementGeneratorMedium : public MovementGeneratorMedium< T, D >,
~TargetedMovementGeneratorMedium() {}
public:
bool DoUpdate(T &, const uint32 &);
bool DoUpdate(T &, uint32);
Unit* GetTarget() const { return i_target.getTarget(); }
void unitSpeedChanged() { i_recalculateTravel=true; }
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+2 -2
View File
@@ -130,7 +130,7 @@ bool WaypointMovementGenerator<Creature>::StartMove(Creature &creature)
return true;
}
bool WaypointMovementGenerator<Creature>::DoUpdate(Creature &creature, const uint32 &diff)
bool WaypointMovementGenerator<Creature>::DoUpdate(Creature &creature, uint32 diff)
{
// Waypoint movement can be switched on/off
// This is quite handy for escort quests and other stuff
@@ -243,7 +243,7 @@ void FlightPathMovementGenerator::DoReset(Player & player)
init.Launch();
}
bool FlightPathMovementGenerator::DoUpdate(Player &player, const uint32& /*diff*/)
bool FlightPathMovementGenerator::DoUpdate(Player &player, uint32 /*diff*/)
{
uint32 pointId = (uint32)player.movespline->currentPathIdx();
if (pointId > i_currentNode)
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+2 -2
View File
@@ -68,7 +68,7 @@ class WaypointMovementGenerator<Creature> : public MovementGeneratorMedium< Crea
void DoInitialize(Creature &);
void DoFinalize(Creature &);
void DoReset(Creature &);
bool DoUpdate(Creature &, const uint32 &diff);
bool DoUpdate(Creature &, uint32 diff);
void MovementInform(Creature &);
@@ -121,7 +121,7 @@ class FlightPathMovementGenerator : public MovementGeneratorMedium< Player, Flig
void DoInitialize(Player &);
void DoReset(Player &);
void DoFinalize(Player &);
bool DoUpdate(Player &, const uint32&);
bool DoUpdate(Player &, uint32);
MovementGeneratorType GetMovementGeneratorType() { return FLIGHT_MOTION_TYPE; }
TaxiPathNodeList const& GetPath() { return *i_path; }