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

Removed stupid/not needed file Spellid.h.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
n0n4m3
2010-02-15 18:23:39 +01:00
parent 922b368aac
commit bcd4a48328
31 changed files with 231 additions and 140390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+21 -23
View File
@@ -66,7 +66,6 @@
#include "AchievementMgr.h"
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "SpellId.h"
#include <cmath>
@@ -1465,7 +1464,7 @@ void Player::setDeathState(DeathState s)
// restore default warrior stance
if (getClass() == CLASS_WARRIOR)
CastSpell(this,SPELL_BATTLE_STANCE_2457,true);
CastSpell(this, 2457, true);
}
}
@@ -1786,8 +1785,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
}
else
{
if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster()
&& !HasSpell(SPELL_DEATH_GATE_50977))
if (getClass() == CLASS_DEATH_KNIGHT && GetMapId() == 609 && !isGameMaster() && !HasSpell(50977))
return false;
// far teleport to another map
@@ -1941,7 +1939,7 @@ void Player::ProcessDelayedOperations()
SaveToDB();
if (m_DelayedOperations & DELAYED_SPELL_CAST_DESERTER)
CastSpell(this, SPELL_DESERTER_26013, true); // Deserter
CastSpell(this, 26013, true); // Deserter
if (m_DelayedOperations & DELAYED_BG_MOUNT_RESTORE)
{
@@ -4364,9 +4362,9 @@ void Player::BuildPlayerRepop()
data.append(GetPackGUID());
GetSession()->SendPacket(&data);
if(getRace() == RACE_NIGHTELF)
CastSpell(this, SPELL_GHOST_20584, true);
CastSpell(this, SPELL_GHOST_8326, true);
if (getRace() == RACE_NIGHTELF)
CastSpell(this, 20584, true);
CastSpell(this, 8326, true);
// there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK
// there must be SMSG.STOP_MIRROR_TIMER
@@ -4425,9 +4423,9 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
// remove death flag + set aura
SetByteValue(UNIT_FIELD_BYTES_1, 3, 0x00);
if(getRace() == RACE_NIGHTELF)
RemoveAurasDueToSpell(SPELL_GHOST_20584); // speed bonuses
RemoveAurasDueToSpell(SPELL_GHOST_8326); // SPELL_AURA_GHOST
if (getRace() == RACE_NIGHTELF)
RemoveAurasDueToSpell(20584); // speed bonuses
RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST
setDeathState(ALIVE);
@@ -4467,14 +4465,14 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
if(int32(getLevel()) >= startLevel)
{
// set resurrection sickness
CastSpell(this,SPELL_RESURRECTION_SICKNESS_15007,true);
CastSpell(this, 15007, true);
// not full duration
if(int32(getLevel()) < startLevel+9)
{
int32 delta = (int32(getLevel()) - startLevel + 1)*MINUTE;
if(Aura * aur = GetAura(SPELL_RESURRECTION_SICKNESS_15007, GetGUID()))
if(Aura * aur = GetAura(15007, GetGUID()))
{
aur->SetDuration(delta*IN_MILISECONDS);
}
@@ -7601,7 +7599,7 @@ void Player::CastItemUseSpell(Item *item,SpellCastTargets const& targets,uint8 c
{
ItemPrototype const* proto = item->GetProto();
// special learning case
if (proto->Spells[0].SpellId == SPELL_LEARNING_483 || proto->Spells[0].SpellId==SPELL_LEARNING_55884)
if (proto->Spells[0].SpellId == 483 || proto->Spells[0].SpellId == 55884)
{
uint32 learn_spell_id = proto->Spells[0].SpellId;
uint32 learning_spell_id = proto->Spells[1].SpellId;
@@ -11249,10 +11247,10 @@ Item* Player::EquipItem( uint16 pos, Item *pItem, bool update )
if(pProto && isInCombat()&& pProto->Class == ITEM_CLASS_WEAPON && m_weaponChangeTimer == 0)
{
uint32 cooldownSpell = SPELL_COMBAT_SWAP_DND_6119;
uint32 cooldownSpell = 6119;
if (getClass() == CLASS_ROGUE)
cooldownSpell = SPELL_COMBAT_SWAP_DND_6123;
cooldownSpell = 6123;
SpellEntry const* spellProto = sSpellStore.LookupEntry(cooldownSpell);
@@ -16185,8 +16183,8 @@ void Player::_LoadAuras(QueryResult_AutoPtr result, uint32 timediff)
while (result->NextRow());
}
if(getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
CastSpell(this,SPELL_BATTLE_STANCE_2457,true);
if (getClass() == CLASS_WARRIOR && !HasAuraType(SPELL_AURA_MOD_SHAPESHIFT))
CastSpell(this, 2457, true);
}
void Player::_LoadGlyphAuras()
@@ -19418,7 +19416,7 @@ void Player::AddSpellAndCategoryCooldowns(SpellEntry const* spellInfo, uint32 it
{
// shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK)
// prevent 0 cooldowns set by another way
if (rec <= 0 && catrec <= 0 && (cat == 76 || IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != SPELL_AUTO_SHOT_75))
if (rec <= 0 && catrec <= 0 && (cat == 76 || IsAutoRepeatRangedSpell(spellInfo) && spellInfo->Id != 75))
rec = GetAttackTime(RANGED_ATTACK);
// Now we have cooldown data (if found any), time to apply mods
@@ -19732,7 +19730,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
return;
}
CastSpell(this, SPELL_DESERTER_26013, true); // Deserter
CastSpell(this, 26013, true); // Deserter
}
}
}
@@ -19741,7 +19739,7 @@ void Player::LeaveBattleground(bool teleportToEntryPoint)
bool Player::CanJoinToBattleground() const
{
// check Deserter debuff
if(HasAura(SPELL_DESERTER_26013))
if (HasAura(26013))
return false;
return true;
@@ -19781,7 +19779,7 @@ WorldLocation Player::GetStartPosition() const
{
PlayerInfo const *info = objmgr.GetPlayerInfo(getRace(), getClass());
uint32 mapId = info->mapId;
if(getClass() == CLASS_DEATH_KNIGHT && HasSpell(SPELL_DEATH_GATE_50977))
if (getClass() == CLASS_DEATH_KNIGHT && HasSpell(50977))
mapId = 0;
return WorldLocation(mapId, info->positionX, info->positionY, info->positionZ, 0);
}
@@ -20286,7 +20284,7 @@ void Player::SendInitialPacketsAfterAddToMap()
ResetTimeSync();
SendTimeSync();
CastSpell(this, SPELL_LOGINEFFECT_836, true); // LOGINEFFECT
CastSpell(this, 836, true); // LOGINEFFECT
// set some aura effects that send packet to player client after add player to map
// SendMessageToSet not send it to player not it map, only for aura that not changed anything at re-apply