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

Core: Removed all double (and more) empty lines

Browse Source
This commit is contained in:
Shauren
2011-03-21 10:52:14 +01:00
parent f8162d609b
commit 2f79b0f266
353 changed files with 2 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/authserver/Server/RealmSocket.cpp
-1
View File
@@ -276,7 +276,6 @@ int RealmSocket::handle_input(ACE_HANDLE)
return n == space ? 1 : 0;
}
void RealmSocket::set_session(Session* session)
{
if (session_ != NULL)
src/server/collision/Maps/MapTree.cpp
-1
View File
@@ -89,7 +89,6 @@ namespace VMAP
bool result;
};
//=========================================================
std::string StaticMapTree::getTileFileName(uint32 mapID, uint32 tileX, uint32 tileY)
src/server/collision/Models/ModelInstance.h
-1
View File
@@ -56,7 +56,6 @@ namespace VMAP
// temp?
const G3D::AABox& getBounds() const { return iBound; }
static bool readFromFile(FILE *rf, ModelSpawn &spawn);
static bool writeToFile(FILE *rw, const ModelSpawn &spawn);
};
src/server/collision/Models/WorldModel.cpp
-1
View File
@@ -28,7 +28,6 @@ template<> struct BoundsTrait<VMAP::GroupModel>
static void getBounds(const VMAP::GroupModel& obj, G3D::AABox& out) { out = obj.GetBound(); }
};
namespace VMAP
{
bool IntersectTriangle(const MeshTriangle &tri, std::vector<Vector3>::const_iterator points, const G3D::Ray &ray, float &distance)
src/server/game/AI/CoreAI/CombatAI.cpp
-1
View File
@@ -298,7 +298,6 @@ VehicleAI::VehicleAI(Creature *c) : CreatureAI(c), m_vehicle(c->GetVehicleKit())
m_DismissTimer = VEHICLE_DISMISS_TIME;
}
//NOTE: VehicleAI::UpdateAI runs even while the vehicle is mounted
void VehicleAI::UpdateAI(const uint32 diff)
{
src/server/game/AI/CoreAI/GuardAI.cpp
-2
View File
@@ -35,7 +35,6 @@ GuardAI::GuardAI(Creature* creature) : ScriptedAI(creature), i_victimGuid(0), i_
{
}
bool GuardAI::CanSeeAlways(WorldObject const* obj)
{
if (!obj->isType(TYPEMASK_UNIT))
@@ -139,7 +138,6 @@ void GuardAI::UpdateAI(const uint32 /*diff*/)
}
}
void GuardAI::JustDied(Unit* killer)
{
if (Player* pkiller = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
src/server/game/AI/CreatureAI.cpp
-1
View File
@@ -34,7 +34,6 @@ void CreatureAI::OnCharmed(bool /*apply*/)
AISpellInfoType * UnitAI::AISpellInfo;
AISpellInfoType * GetAISpellInfo(uint32 i) { return &CreatureAI::AISpellInfo[i]; }
void CreatureAI::Talk(uint8 id, uint64 WhisperGuid)
{
sCreatureTextMgr->SendChat(me, id, WhisperGuid);
src/server/game/AI/EventAI/CreatureEventAI.cpp
-2
View File
@@ -870,14 +870,12 @@ void CreatureEventAI::Reset()
if (m_bEmptyList)
return;
for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
{
if ((*i).Event.event_type == EVENT_T_RESET)
ProcessEvent(*i);
}
//Reset all events to enabled
for (CreatureEventAIList::iterator i = m_CreatureEventAIList.begin(); i != m_CreatureEventAIList.end(); ++i)
{
src/server/game/AI/SmartScripts/SmartAI.cpp
-2
View File
@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DatabaseEnv.h"
#include "SQLStorage.h"
#include "ObjectMgr.h"
@@ -211,7 +210,6 @@ void SmartAI::EndPath(bool fail)
else
GetScript()->SetPathId(0);
ObjectList* targets = GetScript()->GetTargetList(SMART_ESCORT_TARGETS);
if (targets && mEscortQuestID)
{
src/server/game/AI/SmartScripts/SmartScript.cpp
-3
View File
@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DatabaseEnv.h"
#include "SQLStorage.h"
#include "ObjectMgr.h"
@@ -2472,7 +2471,6 @@ void SmartScript::UpdateAIWhileCharmed(const uint32 diff)
{
}
void SmartScript::DoAction(const int32 param)
{
}
@@ -2513,7 +2511,6 @@ uint32 SmartScript::DoChat(int8 id, uint64 whisperGuid)
}*/
// SmartScript end
Unit* SmartScript::DoSelectLowestHpFriendly(float range, uint32 MinHPDiff)
{
if (!me) return NULL;
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
-3
View File
@@ -15,7 +15,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "DatabaseEnv.h"
#include "SQLStorage.h"
#include "ObjectMgr.h"
@@ -63,7 +62,6 @@ void SmartWaypointMgr::LoadFromDB()
y = fields[3].GetFloat();
z = fields[4].GetFloat();
WayPoint *wp = new WayPoint(id, x, y, z);
if (last_entry != entry)
@@ -584,7 +582,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder &e)
break;
case SMART_ACTION_SET_EVENT_PHASE:
if (e.action.setEventPhase.phase >= SMART_EVENT_PHASE_MAX)
{
src/server/game/AI/SmartScripts/SmartScriptMgr.h
-2
View File
@@ -692,7 +692,6 @@ struct SmartAction
uint32 id;
} taxi;
struct
{
uint32 run;
@@ -762,7 +761,6 @@ struct SmartAction
uint32 id;
} storeTargets;
struct
{
uint32 id;
src/server/game/Achievements/AchievementMgr.cpp
-1
View File
@@ -2457,7 +2457,6 @@ void AchievementGlobalMgr::LoadRewardLocales()
return;
}
do
{
Field *fields = result->Fetch();
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
-2
View File
@@ -304,7 +304,6 @@ void AuctionHouseMgr::SendAuctionCancelledToBidderMail(AuctionEntry* auction, SQ
}
}
void AuctionHouseMgr::LoadAuctionItems()
{
uint32 oldMSTime = getMSTime();
@@ -374,7 +373,6 @@ void AuctionHouseMgr::LoadAuctions()
{
Field* fields = result->Fetch();
AuctionEntry *aItem = new AuctionEntry();
if (!aItem->LoadFromDB(fields))
{
src/server/game/Battlegrounds/Battleground.cpp
-1
View File
@@ -812,7 +812,6 @@ void Battleground::EndBattleground(uint32 winner)
UpdatePlayerScore(plr, SCORE_BONUS_HONOR, GetBonusHonorFromKill(loser_kills));
}
plr->ResetAllPowers();
plr->CombatStopWithPets(true);
src/server/game/Battlegrounds/BattlegroundMgr.cpp
-1
View File
@@ -21,7 +21,6 @@
#include "World.h"
#include "WorldPacket.h"
#include "ArenaTeam.h"
#include "BattlegroundMgr.h"
#include "BattlegroundAV.h"
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
-1
View File
@@ -1490,4 +1490,3 @@ void BattlegroundAV::ResetBGSubclass()
}
src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
-1
View File
@@ -171,7 +171,6 @@ void BattlegroundDS::Reset()
Battleground::Reset();
}
bool BattlegroundDS::SetupBattleground()
{
// gates
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
-1
View File
@@ -908,7 +908,6 @@ class BattlegroundIC : public Battleground
Transport* gunshipAlliance;
Transport* gunshipHorde;
uint32 GetNextBanner(ICNodePoint* nodePoint,uint32 team, bool returnDefinitve);
uint32 GetGateIDFromEntry(uint32 id)
src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
-1
View File
@@ -167,7 +167,6 @@ bool BattlegroundRV::HandlePlayerUnderMap(Player *player)
return true;
}
void BattlegroundRV::HandleAreaTrigger(Player *Source, uint32 Trigger)
{
if (GetStatus() != STATUS_IN_PROGRESS)
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
-2
View File
@@ -24,7 +24,6 @@
#include "ObjectMgr.h"
#include "WorldPacket.h"
BattlegroundSA::BattlegroundSA()
{
m_StartMessageIds[BG_STARTING_EVENT_FIRST] = LANG_BG_SA_START_TWO_MINUTES;
@@ -70,7 +69,6 @@ bool BattlegroundSA::ResetObjs()
uint32 atF = BG_SA_Factions[Attackers];
uint32 defF = BG_SA_Factions[Attackers ? TEAM_ALLIANCE : TEAM_HORDE];
for (uint8 i = 0; i <BG_SA_MAXOBJ; i++)
DelObject(i);
src/server/game/Battlegrounds/Zones/BattlegroundSA.h
-3
View File
@@ -72,7 +72,6 @@ enum BG_SA_WorldStates
BG_SA_YELLOW_GATEWS = 3638,
BG_SA_ANCIENT_GATEWS = 3849,
BG_SA_LEFT_GY_ALLIANCE = 3635,
BG_SA_RIGHT_GY_ALLIANCE = 3636,
BG_SA_CENTER_GY_ALLIANCE = 3637,
@@ -485,7 +484,6 @@ class BattlegroundSA : public Battleground
void RemovePlayer(Player *plr,uint64 guid);
void HandleAreaTrigger(Player *Source, uint32 Trigger);
/* Scorekeeping */
/// Update score board
void UpdatePlayerScore(Player *Source, uint32 type, uint32 value, bool doAddHonor = true);
@@ -542,7 +540,6 @@ class BattlegroundSA : public Battleground
/// Send packet to player for destroy boats (client part)
void SendTransportsRemove(Player * player);
/// Id of attacker team
TeamId Attackers;
/// Totale elapsed time of current round
src/server/game/Chat/Channels/Channel.cpp
-1
View File
@@ -141,7 +141,6 @@ void Channel::CleanOldChannelsInDB()
}
}
void Channel::Join(uint64 p, const char *pass)
{
WorldPacket data;
src/server/game/Chat/Commands/Level3.cpp
-1
View File
@@ -4453,7 +4453,6 @@ bool ChatHandler::HandleChannelSetOwnership(const char *args)
return true;
}
/*------------------------------------------
*-------------TRINITY----------------------
*-------------------------------------*/
src/server/game/Combat/HostileRefManager.cpp
-1
View File
@@ -69,7 +69,6 @@ void HostileRefManager::addTempThreat(float fThreat, bool apply)
}
}
//=================================================
void HostileRefManager::addThreatPercent(int32 iPercent)
src/server/game/Conditions/ConditionMgr.cpp
-3
View File
@@ -17,7 +17,6 @@
*/
#include "Player.h"
#include "SpellAuras.h"
#include "SpellMgr.h"
@@ -375,7 +374,6 @@ void ConditionMgr::LoadConditions(bool isReload)
sObjectMgr->LoadGossipMenuItems();
}
QueryResult result = WorldDatabase.Query("SELECT SourceTypeOrReferenceId, SourceGroup, SourceEntry, ElseGroup, ConditionTypeOrReference,"
" ConditionValue1, ConditionValue2, ConditionValue3, ErrorTextId, ScriptName FROM conditions");
@@ -1408,7 +1406,6 @@ void ConditionMgr::Clean()
m_ConditionMap.clear();
for (VehicleSpellConditionMap::iterator itr = m_VehicleSpellConditions.begin(); itr != m_VehicleSpellConditions.end(); ++itr)
{
for (ConditionTypeMap::iterator it = itr->second.begin(); it != itr->second.end(); ++it)
src/server/game/Conditions/DisableMgr.cpp
-1
View File
@@ -54,7 +54,6 @@ void DisableMgr::LoadDisables()
return;
}
Field* fields;
do
{
src/server/game/DataStores/DBCStructure.h
-3
View File
@@ -1234,7 +1234,6 @@ struct MapDifficultyEntry
//char* difficultyString; // 22
};
struct MovieEntry
{
uint32 Id; // 0 index
@@ -1680,7 +1679,6 @@ struct StableSlotPricesEntry
uint32 Price;
};
struct SummonPropertiesEntry
{
uint32 Id; // 0
@@ -1691,7 +1689,6 @@ struct SummonPropertiesEntry
uint32 Flags; // 5
};
#define MAX_TALENT_RANK 5
#define MAX_PET_TALENT_RANK 3 // use in calculations, expected <= MAX_TALENT_RANK
#define MAX_TALENT_TABS 3
src/server/game/DungeonFinding/LFGMgr.cpp
-1
View File
@@ -1885,7 +1885,6 @@ std::string LFGMgr::ConcatenateGuids(LfgGuidList check)
return o.str();
}
LfgState LFGMgr::GetState(const uint64& guid)
{
sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::GetState: [" UI64FMTD "]", guid);
src/server/game/DungeonFinding/LFGMgr.h
-2
View File
@@ -115,7 +115,6 @@ enum LfgAnswer
LFG_ANSWER_AGREE = 1
};
// Forward declaration (just to have all typedef together)
struct LfgReward;
struct LfgLockStatus;
@@ -210,7 +209,6 @@ struct LfgProposalPlayer
uint32 groupLowGuid; ///< Original group guid (Low guid) 0 if no original group
};
/// Stores group data related to proposal to join
struct LfgProposal
{
src/server/game/DungeonFinding/LFGScripts.cpp
-1
View File
@@ -122,7 +122,6 @@ void LFGScripts::OnChangeLeader(Group* group, uint64 newLeaderGuid, uint64 oldLe
if (plr)
plr->GetSession()->SendLfgUpdateParty(updateData);
plr = sObjectMgr->GetPlayer(oldLeaderGuid);
if (plr)
{
src/server/game/Entities/Creature/Creature.cpp
-1
View File
@@ -49,7 +49,6 @@
#include "Group.h"
// apply implementation of the singletons
TrainerSpell const* TrainerSpellData::Find(uint32 spell_id) const
{
TrainerSpellMap::const_iterator itr = spellList.find(spell_id);
src/server/game/Entities/GameObject/GameObject.cpp
-1
View File
@@ -827,7 +827,6 @@ bool GameObject::IsDynTransport() const
return gInfo->type == GAMEOBJECT_TYPE_MO_TRANSPORT || (gInfo->type == GAMEOBJECT_TYPE_TRANSPORT && !gInfo->transport.pause);
}
Unit* GameObject::GetOwner() const
{
return ObjectAccessor::GetUnit(*this, GetOwnerGUID());
src/server/game/Entities/Item/Item.cpp
-2
View File
@@ -767,7 +767,6 @@ bool Item::CanBeTraded(bool mail, bool trade) const
return true;
}
bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const
{
@@ -781,7 +780,6 @@ bool Item::HasEnchantRequiredSkill(const Player *pPlayer) const
return true;
}
uint32 Item::GetEnchantRequiredLevel() const
{
src/server/game/Entities/Player/Player.cpp
-2
View File
@@ -15170,7 +15170,6 @@ bool Player::SatisfyQuestPreviousQuest(Quest const* qInfo, bool msg)
return true;
}
// If any of the negative previous quests active, return true
if (*iter < 0 && GetQuestStatus(prevId) != QUEST_STATUS_NONE)
{
@@ -21721,7 +21720,6 @@ void Player::SetDailyQuestStatus(uint32 quest_id)
}
}
void Player::SetWeeklyQuestStatus(uint32 quest_id)
{
m_weeklyquests.insert(quest_id);
src/server/game/Entities/Unit/Unit.cpp
-5
View File
@@ -312,7 +312,6 @@ void Unit::SendMonsterMoveWithSpeedToCurrentDestination(Player* player)
SendMonsterMoveWithSpeed(x, y, z, 0, player);
}
void Unit::SendMonsterMoveWithSpeed(float x, float y, float z, uint32 transitTime, Player* player)
{
if (!transitTime)
@@ -3720,7 +3719,6 @@ void Unit::RemoveAurasDueToSpellBySteal(uint32 spellId, uint64 casterGUID, Unit
else
RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);
if (Aura * newAura = stealCharge ? stealer->GetAura(aura->GetId(), aura->GetCasterGUID()) : NULL)
{
uint8 newCharges = newAura->GetCharges() + 1;
@@ -3836,7 +3834,6 @@ void Unit::RemoveNotOwnSingleTargetAuras(uint32 newPhase)
}
}
void Unit::RemoveAurasWithInterruptFlags(uint32 flag, uint32 except)
{
if (!(m_interruptMask & flag))
@@ -11104,7 +11101,6 @@ uint32 Unit::SpellHealingBonus(Unit *pVictim, SpellEntry const *spellProto, uint
if (AuraEffect const* Tenacity = pVictim->GetAuraEffect(58549, 0))
AddPctN(TakenTotalMod, Tenacity->GetAmount());
// Healing taken percent
float minval = (float)pVictim->GetMaxNegativeAuraModifier(SPELL_AURA_MOD_HEALING_PCT);
if (minval)
@@ -12655,7 +12651,6 @@ Unit* Creature::SelectVictim()
return target;
}
Unit::AuraEffectList const& iAuras = GetAuraEffectsByType(SPELL_AURA_MOD_INVISIBILITY);
if(!iAuras.empty())
{
src/server/game/Entities/Unit/Unit.h
-1
View File
@@ -1380,7 +1380,6 @@ class Unit : public WorldObject
void CalculateSpellDamageTaken(SpellNonMeleeDamage *damageInfo, int32 damage, SpellEntry const *spellInfo, WeaponAttackType attackType = BASE_ATTACK, bool crit = false);
void DealSpellDamage(SpellNonMeleeDamage *damageInfo, bool durabilityLoss);
// player or player's pet resilience (-1%)
float GetMeleeCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_MELEE); }
float GetRangedCritChanceReduction() const { return GetCombatRatingReduction(CR_CRIT_TAKEN_RANGED); }
src/server/game/Entities/Vehicle/Vehicle.cpp
-1
View File
@@ -244,7 +244,6 @@ void Vehicle::InstallAccessory(uint32 entry, int8 seatId, bool minion, uint8 typ
if (minion)
accessory->AddUnitTypeMask(UNIT_MASK_ACCESSORY);
if (!me->HandleSpellClick(accessory, seatId))
{
accessory->AddObjectToRemoveList();
src/server/game/Entities/Vehicle/Vehicle.h
-1
View File
@@ -77,7 +77,6 @@ enum VehicleSpells
VEHICLE_SPELL_PARACHUTE = 45472
};
struct VehicleSeat
{
explicit VehicleSeat(VehicleSeatEntry const *_seatInfo) : seatInfo(_seatInfo), passenger(NULL) {}
src/server/game/Events/GameEventMgr.cpp
-1
View File
@@ -358,7 +358,6 @@ void GameEventMgr::LoadFromDB()
}
}
sLog->outString("Loading Game Event Creature Data...");
{
uint32 oldMSTime = getMSTime();
src/server/game/Grids/Notifiers/GridNotifiersImpl.h
-1
View File
@@ -27,7 +27,6 @@
#include "CreatureAI.h"
#include "SpellAuras.h"
template<class T>
inline void
Trinity::VisibleNotifier::Visit(GridRefManager<T> &m)
src/server/game/Groups/Group.cpp
-2
View File
@@ -1689,7 +1689,6 @@ InstanceGroupBind* Group::GetBoundInstance(MapEntry const* mapEntry)
return NULL;
}
InstanceGroupBind* Group::BindToInstance(InstanceSave *save, bool permanent, bool load)
{
if (!save || isBGGroup())
@@ -1922,7 +1921,6 @@ void Group::SetBattlegroundGroup(Battleground *bg)
m_bgGroup = bg;
}
void Group::SetGroupMemberFlag(uint64 guid, const bool &apply, GroupMemberFlags flag)
{
// Assistants, main assistants and main tanks are only available in raid groups
src/server/game/Mails/Mail.cpp
-1
View File
@@ -67,7 +67,6 @@ MailSender::MailSender(Player* sender)
m_senderId = sender->GetGUIDLow();
}
MailReceiver::MailReceiver(Player* receiver) : m_receiver(receiver), m_receiver_lowguid(receiver->GetGUIDLow())
{
}
src/server/game/Miscellaneous/Language.h
-2
View File
@@ -25,7 +25,6 @@ enum TrinityStrings
LANG_SELECT_CHAR_OR_CREATURE = 1,
LANG_SELECT_CREATURE = 2,
// level 0 chat
LANG_SYSTEMMESSAGE = 3,
LANG_EVENTMESSAGE = 4,
@@ -951,7 +950,6 @@ enum TrinityStrings
LANG_MAIL_SENDER_REQ = 6611,
LANG_MAIL_RECEIVER_REQ = 6612,
// Used for GM Announcements
LANG_GM_BROADCAST = 6613,
LANG_GM_NOTIFY = 6614,
src/server/game/Movement/MovementGenerator.cpp
-1
View File
@@ -22,4 +22,3 @@ MovementGenerator::~MovementGenerator()
{
}
src/server/game/Movement/MovementGenerator.h
-1
View File
@@ -97,4 +97,3 @@ typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderReg
typedef FactoryHolder<MovementGenerator,MovementGeneratorType>::FactoryHolderRepository MovementGeneratorRepository;
#endif
src/server/game/Movement/MovementGeneratorImpl.h
-1
View File
@@ -29,4 +29,3 @@ MovementGeneratorFactory<MOVEMENT_GEN>::Create(void * /*data*/) const
}
#endif
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
-1
View File
@@ -182,4 +182,3 @@ template void ConfusedMovementGenerator<Creature>::Reset(Creature &creature);
template bool ConfusedMovementGenerator<Player>::Update(Player &player, const uint32 &diff);
template bool ConfusedMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff);
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
-1
View File
@@ -54,4 +54,3 @@ class ConfusedMovementGenerator
};
#endif
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
-1
View File
@@ -78,4 +78,3 @@ class TimedFleeingMovementGenerator
#endif
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
-1
View File
@@ -94,4 +94,3 @@ HomeMovementGenerator<Creature>::Update(Creature &owner, const uint32& time_diff
return true;
}
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
-1
View File
@@ -55,4 +55,3 @@ class HomeMovementGenerator<Creature>
};
#endif
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
-1
View File
@@ -77,4 +77,3 @@ class AssistanceDistractMovementGenerator : public DistractMovementGenerator
#endif
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
-1
View File
@@ -63,4 +63,3 @@ class AssistanceMovementGenerator
#endif
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
-1
View File
@@ -198,4 +198,3 @@ RandomMovementGenerator<Creature>::Update(Creature &creature, const uint32 &diff
return true;
}
src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
-1
View File
@@ -51,4 +51,3 @@ class RandomMovementGenerator
};
#endif
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
-1
View File
@@ -275,4 +275,3 @@ template bool TargetedMovementGenerator<Creature>::Update(Creature &, const uint
template Unit* TargetedMovementGenerator<Player>::GetTarget() const;
template Unit* TargetedMovementGenerator<Creature>::GetTarget() const;
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
-1
View File
@@ -71,4 +71,3 @@ class TargetedMovementGenerator
};
#endif
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
-2
View File
@@ -367,7 +367,6 @@ void FlightPathMovementGenerator::DoEventIfAny(Player& player, TaxiPathNodeEntry
}
//
// Unique1's ASTAR Pathfinding Code... For future use & reference...
//
@@ -694,4 +693,3 @@ int GetFCost(int to, int num, int parentNum, float *gcost)
}
#endif //__PATHFINDING__
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
-1
View File
@@ -129,4 +129,3 @@ public PathMovementBase<Player,TaxiPathNodeList const*>
};
#endif
src/server/game/Pools/PoolMgr.cpp
-1
View File
@@ -721,7 +721,6 @@ void PoolMgr::LoadFromDB()
}
}
// Pool of pools
sLog->outString("Loading Mother Pooling Data...");
src/server/game/Scripting/ScriptLoader.cpp
-1
View File
@@ -17,7 +17,6 @@
#include "ScriptLoader.h"
//examples
void AddSC_example_creature();
void AddSC_example_escort();
src/server/game/Server/Protocol/Handlers/BattleGroundHandler.cpp
-2
View File
@@ -601,7 +601,6 @@ void WorldSession::HandleAreaSpiritHealerQueryOpcode(WorldPacket & recv_data)
sBattlegroundMgr->SendAreaSpiritHealerQueryOpcode(_player, bg, guid);
}
void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_AREA_SPIRIT_HEALER_QUEUE");
@@ -622,7 +621,6 @@ void WorldSession::HandleAreaSpiritHealerQueueOpcode(WorldPacket & recv_data)
bg->AddPlayerToResurrectQueue(guid, _player->GetGUID());
}
void WorldSession::HandleBattlemasterJoinArena(WorldPacket & recv_data)
{
sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: CMSG_BATTLEMASTER_JOIN_ARENA");
src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
-1
View File
@@ -1658,7 +1658,6 @@ void WorldSession::HandleMoveSetCanFlyAckOpcode(WorldPacket & recv_data)
uint64 guid; // guid - unused
recv_data.readPackGUID(guid);
recv_data.read_skip<uint32>(); // unk
MovementInfo movementInfo;
src/server/game/Spells/Auras/SpellAuraEffects.cpp
-1
View File
@@ -6418,7 +6418,6 @@ void AuraEffect::HandleAuraModFaction(AuraApplication const * aurApp, uint8 mode
}
}
void AuraEffect::HandleComprehendLanguage(AuraApplication const * aurApp, uint8 mode, bool apply) const
{
if (!(mode & AURA_EFFECT_HANDLE_SEND_FOR_CLIENT_MASK))
src/server/game/Spells/Auras/SpellAuras.cpp
-2
View File
@@ -789,7 +789,6 @@ bool Aura::ModStackAmount(int32 num)
return false;
}
bool Aura::IsPassive() const
{
return IsPassiveSpell(GetSpellProto());
@@ -1829,7 +1828,6 @@ void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect * aurEff, AuraApplicat
}
}
void Aura::CallScriptEffectManaShieldHandlers(AuraEffect * aurEff, AuraApplication const * aurApp, DamageInfo & dmgInfo, uint32 & absorbAmount, bool & defaultPrevented)
{
for(std::list<AuraScript *>::iterator scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end() ; ++scritr)
src/server/game/Spells/SpellEffects.cpp
-1
View File
@@ -1659,7 +1659,6 @@ void Spell::EffectForceCastWithValue(SpellEffIndex effIndex)
caster->CastCustomSpell(unitTarget, spellInfo->Id, &bp, &bp, &bp, true, NULL, NULL, m_originalCasterGUID);
}
void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
{
// only unit case known
src/server/game/Spells/SpellMgr.cpp
-22
View File
@@ -1131,7 +1131,6 @@ void SpellMgr::LoadSpellTargetPositions()
{
Field *fields = result->Fetch();
uint32 Spell_ID = fields[0].GetUInt32();
SpellTargetPosition st;
@@ -1271,7 +1270,6 @@ void SpellMgr::LoadSpellProcEvents()
{
Field *fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
const SpellEntry *spell = sSpellStore.LookupEntry(entry);
@@ -1501,20 +1499,17 @@ void SpellMgr::LoadSpellGroups()
{
sLog->outString();
sLog->outString(">> Loaded %u spell group definitions", count);
return;
}
std::set<uint32> groups;
do
{
Field *fields = result->Fetch();
uint32 group_id = fields[0].GetUInt32();
if (group_id <= SPELL_GROUP_DB_RANGE_MIN && group_id >= SPELL_GROUP_CORE_RANGE_MAX)
{
@@ -1588,18 +1583,15 @@ void SpellMgr::LoadSpellGroupStackRules()
if (!result)
{
sLog->outString(">> Loaded 0 spell group stack rules");
sLog->outString();
return;
}
do
{
Field *fields = result->Fetch();
uint32 group_id = fields[0].GetUInt32();
uint8 stack_rule = fields[1].GetUInt32();
if (stack_rule >= SPELL_GROUP_STACK_RULE_MAX)
@@ -1639,18 +1631,15 @@ void SpellMgr::LoadSpellThreats()
{
sLog->outString(">> Loaded %u aggro generating spells", count);
sLog->outString();
return;
}
do
{
Field *fields = result->Fetch();
uint32 entry = fields[0].GetUInt32();
uint16 Threat = fields[1].GetUInt16();
@@ -2106,7 +2095,6 @@ void SpellMgr::LoadSpellPetAuras()
{
Field *fields = result->Fetch();
uint32 spell = fields[0].GetUInt32();
uint8 eff = fields[1].GetUInt8();
uint32 pet = fields[2].GetUInt32();
@@ -2158,7 +2146,6 @@ void SpellMgr::LoadPetLevelupSpellMap()
uint32 count = 0;
uint32 family_count = 0;
for (uint32 i = 0; i < sCreatureFamilyStore.GetNumRows(); ++i)
{
@@ -2265,7 +2252,6 @@ void SpellMgr::LoadPetDefaultSpells()
uint32 countCreature = 0;
uint32 countData = 0;
for (uint32 i = 0; i < sCreatureStorage.MaxEntry; ++i)
{
@@ -2299,7 +2285,6 @@ void SpellMgr::LoadPetDefaultSpells()
sLog->outString("Loading summonable creature templates...");
oldMSTime = getMSTime();
// different summon spells
for (uint32 i = 0; i < sSpellStore.GetNumRows(); ++i)
{
@@ -2339,7 +2324,6 @@ void SpellMgr::LoadPetDefaultSpells()
}
}
sLog->outString(">> Loaded %u summonable creature templates in %u ms", countCreature, GetMSTimeDiffToNow(oldMSTime));
sLog->outString();
}
@@ -2463,7 +2447,6 @@ void SpellMgr::LoadSpellAreas()
{
Field *fields = result->Fetch();
uint32 spell = fields[0].GetUInt32();
SpellArea spellArea;
spellArea.spellId = spell;
@@ -3273,7 +3256,6 @@ void SpellMgr::LoadSpellEnchantProcData()
if (!result)
{
sLog->outString(">> Loaded %u spell enchant proc event conditions", count);
sLog->outString();
return;
@@ -3283,7 +3265,6 @@ void SpellMgr::LoadSpellEnchantProcData()
{
Field *fields = result->Fetch();
uint32 enchantId = fields[0].GetUInt32();
SpellItemEnchantmentEntry const *ench = sSpellItemEnchantmentStore.LookupEntry(enchantId);
@@ -3383,7 +3364,6 @@ void SpellMgr::LoadSpellRanks()
return;
}
uint32 rows = 0;
bool finished = false;
@@ -4164,7 +4144,6 @@ void SpellMgr::LoadEnchantCustomAttr()
uint32 size = sSpellItemEnchantmentStore.GetNumRows();
mEnchantCustomAttr.resize(size);
uint32 count = 0;
for (uint32 i = 0; i < size; ++i)
@@ -4221,7 +4200,6 @@ void SpellMgr::LoadSpellLinked()
{
Field *fields = result->Fetch();
int32 trigger = fields[0].GetInt32();
int32 effect = fields[1].GetInt32();
int32 type = fields[2].GetInt32();
src/server/game/Spells/SpellMgr.h
-3
View File
@@ -131,12 +131,10 @@ enum SpellFamilyFlag
SPELLFAMILYFLAG_DK_DEATH_COIL = 0x00002000,
SPELLFAMILYFLAG1_DK_HUNGERING_COLD = 0x00001000,
// TODO: Figure out a more accurate name for the following familyflag(s)
SPELLFAMILYFLAG_SHAMAN_TOTEM_EFFECTS = 0x04000000, // Seems to be linked to most totems and some totem effects
};
// Spell clasification
enum SpellSpecific
{
@@ -902,7 +900,6 @@ enum SpellCustomAttributes
SPELL_ATTR0_CU_NEGATIVE = SPELL_ATTR0_CU_NEGATIVE_EFF0 | SPELL_ATTR0_CU_NEGATIVE_EFF1 | SPELL_ATTR0_CU_NEGATIVE_EFF2,
};
typedef std::vector<uint32> SpellCustomAttribute;
typedef std::vector<bool> EnchantCustomAttribute;
src/server/game/Weather/WeatherMgr.cpp
-1
View File
@@ -89,7 +89,6 @@ void WeatherMgr::LoadWeatherData()
return;
}
do
{
Field *fields = result->Fetch();
src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
-1
View File
@@ -162,7 +162,6 @@ class mob_av_marshal_or_warmaster : public CreatureScript
uiEnrageTimer = urand(10*IN_MILLISECONDS,30*IN_MILLISECONDS);
}else uiEnrageTimer -= diff;
// check if creature is not outside of building
if (uiResetTimer <= diff)
{
src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
-1
View File
@@ -179,7 +179,6 @@ public:
uiFrostboltTimer = urand(4*IN_MILLISECONDS,12*IN_MILLISECONDS);
} else uiFrostboltTimer -= diff;
// check if creature is not outside of building
if (uiResetTimer < diff)
{
src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp
-1
View File
@@ -128,7 +128,6 @@ public:
}
};
CreatureAI *GetAI(Creature *creature) const
{
return new boss_drektharAI(creature);
src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp
-2
View File
@@ -41,7 +41,6 @@ public:
{
boss_galvangarAI(Creature *c) : ScriptedAI(c) {}
uint32 uiCleaveTimer;
uint32 uiFrighteningShoutTimer;
uint32 uiWhirlwind1Timer;
@@ -49,7 +48,6 @@ public:
uint32 uiMortalStrikeTimer;
uint32 uiResetTimer;
void Reset()
{
uiCleaveTimer = urand(1*IN_MILLISECONDS,9*IN_MILLISECONDS);
src/server/scripts/EasternKingdoms/BlackrockDepths/blackrock_depths.cpp
-5
View File
@@ -368,7 +368,6 @@ public:
};
/*######
## mob_phalanx
######*/
@@ -538,7 +537,6 @@ public:
};
/*######
## npc_lokhtos_darkbargainer
######*/
@@ -606,7 +604,6 @@ public:
};
/*######
## npc_dughal_stormwing
######*/
@@ -1204,8 +1201,6 @@ public:
};
*/
/*######
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
-1
View File
@@ -110,7 +110,6 @@ public:
};
void AddSC_boss_draganthaurissan()
{
new boss_emperor_dagran_thaurissan();
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_tomb_of_seven.cpp
-1
View File
@@ -95,7 +95,6 @@ public:
};
enum DoomrelSpells
{
SPELL_SHADOWBOLTVOLLEY = 15245,
src/server/scripts/EasternKingdoms/BlackrockDepths/instance_blackrock_depths.cpp
+1 -2
View File
@@ -456,8 +456,7 @@ public:
};
void AddSC_instance_blackrock_depths()
void AddSC_instance_blackrock_depths()
{
new instance_blackrock_depths();
}
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
-1
View File
@@ -202,7 +202,6 @@ public:
};
void AddSC_boss_gyth()
{
new boss_gyth();
src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
-1
View File
@@ -123,7 +123,6 @@ public:
};
void AddSC_boss_razorgore()
{
new boss_razorgore();
src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
-3
View File
@@ -381,9 +381,6 @@ public:
};
void AddSC_boss_victor_nefarius()
{
new boss_victor_nefarius();
src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp
-4
View File
@@ -543,9 +543,6 @@ public:
};
class boss_grubbis : public CreatureScript
{
public:
@@ -592,7 +589,6 @@ public:
};
void AddSC_gnomeregan()
{
new npc_blastmaster_emi_shortfuse();
src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
-1
View File
@@ -137,7 +137,6 @@ public:
};
void AddSC_instance_gnomeregan()
{
new instance_gnomeregan();
src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
-1
View File
@@ -195,7 +195,6 @@ public:
};
void AddSC_boss_curator()
{
new boss_curator();
src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp
-1
View File
@@ -136,7 +136,6 @@ public:
};
void AddSC_boss_maiden_of_virtue()
{
new boss_maiden_of_virtue();
src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp
-1
View File
@@ -310,7 +310,6 @@ void boss_attumen::boss_attumenAI::UpdateAI(const uint32 diff)
DoMeleeAttackIfReady();
}
void AddSC_boss_attumen()
{
new boss_attumen();
src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp
-1
View File
@@ -335,7 +335,6 @@ public:
};
void AddSC_boss_netherspite()
{
new boss_netherspite();
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
-1
View File
@@ -415,7 +415,6 @@ public:
};
void AddSC_boss_nightbane()
{
new boss_nightbane();
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
-10
View File
@@ -744,13 +744,6 @@ public:
};
/**************************************/
/**** Opera Red Riding Hood Event ****/
/************************************/
@@ -800,7 +793,6 @@ public:
};
class boss_bigbadwolf : public CreatureScript
{
public:
@@ -927,7 +919,6 @@ public:
};
/**********************************************/
/******** Opera Romeo and Juliet Event *******/
/********************************************/
@@ -1513,7 +1504,6 @@ void boss_julianne::boss_julianneAI::DamageTaken(Unit* /*done_by*/, uint32 &dama
sLog->outError("TSCR: boss_julianneAI: DamageTaken reach end of code, that should not happen.");
}
void AddSC_bosses_opera()
{
new boss_dorothee();
src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
-1
View File
@@ -310,7 +310,6 @@ public:
};
void AddSC_instance_karazhan()
{
new instance_karazhan();
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
-4
View File
@@ -398,8 +398,6 @@ public:
};
/*###
# npc_berthold
####*/
@@ -441,7 +439,6 @@ public:
};
/*###
# npc_image_of_medivh
####*/
@@ -649,7 +646,6 @@ public:
};
void AddSC_karazhan()
{
new npc_barnes();
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
-5
View File
@@ -685,11 +685,6 @@ public:
};
void AddSC_boss_felblood_kaelthas()
{
new boss_felblood_kaelthas();
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
-2
View File
@@ -332,7 +332,6 @@ public:
};
enum eHealingPotion
{
SPELL_HEALING_POTION = 15503
@@ -576,7 +575,6 @@ public:
};
enum eWarlockSpells
{
SPELL_IMMOLATE = 44267,
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
-2
View File
@@ -321,7 +321,6 @@ public:
};
class mob_fel_crystal : public CreatureScript
{
public:
@@ -368,7 +367,6 @@ public:
};
void AddSC_boss_selin_fireheart()
{
new boss_selin_fireheart();
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
-2
View File
@@ -194,7 +194,6 @@ public:
};
class mob_pure_energy : public CreatureScript
{
public:
@@ -227,7 +226,6 @@ public:
};
void AddSC_boss_vexallus()
{
new boss_vexallus();
src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
-1
View File
@@ -202,7 +202,6 @@ public:
};
void AddSC_instance_magisters_terrace()
{
new instance_magisters_terrace();
src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
-3
View File
@@ -171,9 +171,6 @@ public:
};
void AddSC_magisters_terrace()
{
new npc_kalecgos();
src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
-1
View File
@@ -153,7 +153,6 @@ class mob_firesworn : public CreatureScript
}
};
void AddSC_boss_garr()
{
new boss_garr();
src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
-1
View File
@@ -309,7 +309,6 @@ class boss_ragnaros : public CreatureScript
}
};
class mob_son_of_flame : public CreatureScript
{
public:
src/server/scripts/EasternKingdoms/MoltenCore/instance_molten_core.cpp
-1
View File
@@ -227,7 +227,6 @@ class instance_molten_core : public InstanceMapScript
}
};
void AddSC_instance_molten_core()
{
new instance_molten_core();

Some files were not shown because too many files have changed in this diff Show More