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

* Trailing whitespace removed.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2009-04-06 21:14:51 +02:00
parent 8c13fe15d4
commit cc2a089a9d
75 changed files with 273 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/BattleGround.cpp
+2 -2
View File
@@ -795,7 +795,7 @@ void BattleGround::RewardMark(Player *plr,uint32 count)
if(!plr || !count)
return;
BattleGroundMarks mark;
BattleGroundMarks mark;
switch(GetTypeID())
{
case BATTLEGROUND_AV:
@@ -807,7 +807,7 @@ void BattleGround::RewardMark(Player *plr,uint32 count)
case BATTLEGROUND_AB:
mark = ITEM_AB_MARK_OF_HONOR;
break;
case BATTLEGROUND_EY:
case BATTLEGROUND_EY:
mark = ITEM_EY_MARK_OF_HONOR;
break;
default:
src/game/BattleGroundWS.h
+1 -1
View File
@@ -29,7 +29,7 @@ enum BG_WS_TimerOrScore
BG_WS_FLAG_RESPAWN_TIME = 23000,
BG_WS_FLAG_DROP_TIME = 10000,
BG_WS_SPELL_FORCE_TIME = 600000,
BG_WS_SPELL_BRUTAL_TIME = 900000
BG_WS_SPELL_BRUTAL_TIME = 900000
};
enum BG_WS_Sound
src/game/CMakeLists.txt
+2 -2
View File
@@ -205,7 +205,7 @@ SET(game_STAT_SRCS
PointMovementGenerator.cpp
PointMovementGenerator.h
PoolHandler.cpp
PoolHandler.h
PoolHandler.h
PossessedAI.cpp
PossessedAI.h
QueryHandler.cpp
@@ -245,7 +245,7 @@ SET(game_STAT_SRCS
TemporarySummon.h
TicketHandler.cpp
TicketMgr.cpp
TicketMgr.h
TicketMgr.h
Tools.cpp
Tools.h
TotemAI.cpp
src/game/Chat.cpp
+1 -1
View File
@@ -1034,7 +1034,7 @@ int ChatHandler::ParseCommands(const char* text)
if(!ExecuteCommandInTable(getCommandTable(), text, fullcmd))
{
if(m_session && m_session->GetSecurity() == SEC_PLAYER)
if(m_session && m_session->GetSecurity() == SEC_PLAYER)
return 0;
SendSysMessage(LANG_NO_CMD);
}
src/game/DBCStructure.h
+1 -1
View File
@@ -660,7 +660,7 @@ struct CinematicCameraEntry
float start_x; // 3
float start_y; // 4
float start_z; // 5
float unk6; // 6 speed?
float unk6; // 6 speed?
};
*/
src/game/GridNotifiersImpl.h
+2 -2
View File
@@ -128,7 +128,7 @@ Trinity::CreatureRelocationNotifier::Visit(PlayerMapType &m)
continue;
iter->getSource()->UpdateVisibilityOf(&i_creature);
PlayerCreatureRelocationWorker(iter->getSource(), &i_creature);
}
}
@@ -144,7 +144,7 @@ Trinity::CreatureRelocationNotifier::Visit(CreatureMapType &m)
{
if(iter->getSource()->m_Notified)
continue;
if(!iter->getSource()->isAlive())
continue;
src/game/InstanceData.cpp
+2 -2
View File
@@ -30,8 +30,8 @@ void InstanceData::SaveToDB()
CharacterDatabase.PExecute("UPDATE instance SET data = '%s' WHERE id = '%d'", data.c_str(), instance->GetInstanceId());
}
void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
{
void InstanceData::HandleGameObject(uint64 GUID, bool open, GameObject *go)
{
if(!go)
go = instance->GetGameObjectInMap(GUID);
if(go)
src/game/Language.h
+1 -1
View File
@@ -767,7 +767,7 @@ enum TrinityStrings
LANG_RESET_PET_TALENTS_ONLINE = 1127,
// Room for more level 3 1128-1199 not used
// AV
// AV
LANG_BG_AV_ALLY = 1200,
LANG_BG_AV_HORDE = 1201,
LANG_BG_AV_TOWER_TAKEN = 1202,
src/game/Map.cpp
+1 -1
View File
@@ -495,7 +495,7 @@ Map::Add(T *obj)
AddToGrid(obj,grid,cell);
obj->AddToWorld();
if(obj->isActiveObject())
AddToActive(obj);
src/game/Map.h
+1 -1
View File
@@ -219,7 +219,7 @@ struct CreatureMover
struct InstanceTemplate
{
uint32 map;
uint32 parent;
uint32 parent;
uint32 maxPlayers;
uint32 maxPlayersHeroic;
uint32 reset_delay; // FIX ME: now exist normal/heroic raids with possible different time of reset.
src/game/MapManager.cpp
+1 -1
View File
@@ -214,7 +214,7 @@ bool MapManager::CanPlayerEnter(uint32 mapid, Player* player)
InstanceTemplate const* instance = objmgr.GetInstanceTemplate(mapid);
if(!instance)
return false;
return player->Satisfy(objmgr.GetAccessRequirement(instance->access_id), mapid, true);
}
else
src/game/MiscHandler.cpp
+5 -5
View File
@@ -566,12 +566,12 @@ void WorldSession::HandleAddFriendOpcodeCallBack(QueryResult *result, uint32 acc
uint64 friendGuid;
uint32 team;
FriendsResult friendResult;
WorldSession * session = sWorld.FindSession(accountId);
if(!session || !session->GetPlayer())
return;
friendResult = FRIEND_NOT_FOUND;
friendGuid = 0;
@@ -655,12 +655,12 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 acc
{
uint64 IgnoreGuid;
FriendsResult ignoreResult;
WorldSession * session = sWorld.FindSession(accountId);
if(!session || !session->GetPlayer())
return;
ignoreResult = FRIEND_IGNORE_NOT_FOUND;
IgnoreGuid = 0;
@@ -679,7 +679,7 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(QueryResult *result, uint32 acc
else
{
ignoreResult = FRIEND_IGNORE_ADDED;
// ignore list full
if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true))
ignoreResult = FRIEND_IGNORE_FULL;
src/game/Object.cpp
+2 -2
View File
@@ -1170,8 +1170,8 @@ void WorldObject::SetWorldObject(bool on)
{
if(!IsInWorld())
return;
GetMap()->AddObjectToSwitchList(this, on);
GetMap()->AddObjectToSwitchList(this, on);
}
void WorldObject::setActive( bool on )
src/game/ObjectMgr.cpp
+3 -3
View File
@@ -5078,7 +5078,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
uint32 count = 0;
// 0 1 2 3 4 5 6
// 0 1 2 3 4 5 6
QueryResult *result = WorldDatabase.Query("SELECT id, access_id, target_map, target_position_x, target_position_y, target_position_z, target_orientation FROM areatrigger_teleport");
if( !result )
{
@@ -5119,7 +5119,7 @@ void ObjectMgr::LoadAreaTriggerTeleports()
sLog.outErrorDb("Area trigger (ID:%u) does not exist in `AreaTrigger.dbc`.",Trigger_ID);
continue;
}
MapEntry const* mapEntry = sMapStore.LookupEntry(at.target_mapId);
if(!mapEntry)
{
@@ -5237,7 +5237,7 @@ void ObjectMgr::LoadAccessRequirements()
ar.heroicQuest = 0;
}
}
if(ar.quest)
{
QuestMap::iterator qReqItr = mQuestTemplates.find(ar.quest);
src/game/Pet.cpp
+3 -3
View File
@@ -1148,7 +1148,7 @@ void Pet::_SaveAuras()
{
// skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras.
// do not save single target auras (unless they were cast by the player)
if (itr->second->IsPassive()
if (itr->second->IsPassive()
|| (itr->second->GetCasterGUID() != GetGUID() && itr->second->IsSingleTarget()))
continue;
SpellEntry const *spellInfo = itr->second->GetSpellProto();
@@ -1168,8 +1168,8 @@ void Pet::_SaveAuras()
CharacterDatabase.PExecute("INSERT INTO pet_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) "
"VALUES ('%u', '" I64FMTD "', '%u', '%u', '%u', '%u', '%u', '%d', '%d', '%d', '%d')",
m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
(uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2]
m_charmInfo->GetPetNumber(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
(uint32)itr->second->GetStackAmount(), amounts[0], amounts[1], amounts[2]
,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges()));
}
}
src/game/Player.cpp
+5 -5
View File
@@ -5960,7 +5960,7 @@ bool Player::RewardHonor(Unit *uVictim, uint32 groupsize, float honor, bool pvpt
{
// Check if allowed to receive it in current map
uint8 MapType = sWorld.getConfig(CONFIG_PVP_TOKEN_MAP_TYPE);
if( (MapType == 1 && !InBattleGround() && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
if( (MapType == 1 && !InBattleGround() && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
|| (MapType == 2 && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP))
|| (MapType == 3 && !InBattleGround()) )
return true;
@@ -15841,7 +15841,7 @@ void Player::_SaveAuras()
{
// skip all auras from spell that apply at cast SPELL_AURA_MOD_SHAPESHIFT or pet area auras.
// do not save single target auras (unless they were cast by the player)
if (itr->second->IsPassive()
if (itr->second->IsPassive()
|| (itr->second->GetCasterGUID() != GetGUID() && itr->second->IsSingleTarget())
|| itr->second->IsRemovedOnShapeLost())
continue;
@@ -15861,8 +15861,8 @@ void Player::_SaveAuras()
CharacterDatabase.PExecute("INSERT INTO character_aura (guid,caster_guid,spell,effect_mask,stackcount,amount0, amount1, amount2,maxduration,remaintime,remaincharges) "
"VALUES ('%u', '" I64FMTD "', '%u', '%u', '%d', '%d', '%d', '%d', '%d', '%d', '%d')",
GetGUIDLow(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
(uint32)itr->second->GetStackAmount(), (int32)amounts[0], (int32)amounts[1], (int32)amounts[2]
GetGUIDLow(), itr->second->GetCasterGUID(),(uint32)itr->second->GetId(), (uint32)itr->second->GetEffectMask(),
(uint32)itr->second->GetStackAmount(), (int32)amounts[0], (int32)amounts[1], (int32)amounts[2]
,int(itr->second->GetAuraMaxDuration()),int(itr->second->GetAuraDuration()),int(itr->second->GetAuraCharges()));
}
}
@@ -16872,7 +16872,7 @@ void Player::CharmSpellInitialize()
data << uint8(count); // cooldowns count
data.hexlike();
GetSession()->SendPacket(&data);
}
src/game/SharedDefines.h
+1 -1
View File
@@ -143,7 +143,7 @@ enum Powers
MAX_POWERS = 7,
POWER_ALL = 127, // default for class?
POWER_HEALTH = 0xFFFFFFFE // (-2 as signed value)
};
};
enum SpellSchools
{
src/game/Spell.cpp
+1 -1
View File
@@ -687,7 +687,7 @@ void Spell::prepareDataForTriggerSystem()
if (m_spellInfo->SpellFamilyFlags[1] & 0x00000010 || m_spellInfo->SpellFamilyFlags[0] & 0x1001E000) m_canTrigger = true;
break;
case SPELLFAMILY_HUNTER: // Hunter Rapid Killing/Explosive Trap Effect/Immolation Trap Effect/Frost Trap Aura/Snake Trap Effect/Explosive Shot
if (m_spellInfo->SpellFamilyFlags[1] & 0x01002000
if (m_spellInfo->SpellFamilyFlags[1] & 0x01002000
|| m_spellInfo->SpellFamilyFlags[0] & 0x00000214 ||
m_spellInfo->SpellFamilyFlags[2] & 0x200) m_canTrigger = true;
break;
src/game/SpellAuras.cpp
+8 -8
View File
@@ -232,7 +232,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&AuraEffect::HandleNoImmediateEffect, //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE implemented in Unit::MagicSpellHitResult
&AuraEffect::HandleNoImmediateEffect, //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus
&AuraEffect::HandleNoImmediateEffect, //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS implemented in Unit::SpellDamageBonus
&AuraEffect::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS
&AuraEffect::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS
&AuraEffect::HandleAuraModResistenceOfStatPercent, //182 SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT
&AuraEffect::HandleNULL, //183 SPELL_AURA_MOD_CRITICAL_THREAT only used in 28746
&AuraEffect::HandleNoImmediateEffect, //184 SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst
@@ -367,7 +367,7 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura
{
m_caster_guid = target->GetGUID();
//damage = m_currentBasePoints+1; // stored value-1
m_maxduration = target->CalcSpellDuration(m_spellProto);
m_maxduration = target->CalcSpellDuration(m_spellProto);
}
else
{
@@ -423,7 +423,7 @@ m_auraSlot(MAX_AURAS), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),m_aura
}
}
// Aura is positive when it is casted by friend and at least one aura is positive
// Aura is positive when it is casted by friend and at least one aura is positive
// or when it is casted by enemy and at least one aura is negative
bool swap=false;
if (!caster || caster==target)
@@ -526,7 +526,7 @@ AreaAuraEffect::AreaAuraEffect(Aura * parentAura, uint32 effIndex, int32 * curre
if (m_spellProto->Effect[effIndex] == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY)
m_radius = GetSpellRadiusForHostile(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex]));
else
else
m_radius = GetSpellRadiusForFriend(sSpellRadiusStore.LookupEntry(GetSpellProto()->EffectRadiusIndex[m_effIndex]));
if(Player* modOwner = caster_ptr->GetSpellModOwner())
@@ -6166,7 +6166,7 @@ void AuraEffect::PeriodicTick()
}
// Anger Management
// amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
// amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
// so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec
if(pt == POWER_RAGE)
m_target->ModifyPower(pt, m_amount*3/5);
@@ -6748,8 +6748,8 @@ void AuraEffect::HandleModPossessPet(bool apply, bool Real)
if(apply)
{
if(caster->GetGuardianPet() != m_target)
return;
return;
m_target->SetCharmedOrPossessedBy(caster, true);
}
else
@@ -6777,7 +6777,7 @@ void AuraEffect::HandleModCharm(bool apply, bool Real)
{
if(int32(m_target->getLevel()) > m_amount)
return;
m_target->SetCharmedOrPossessedBy(caster, false);
}
else
src/game/SpellEffects.cpp
+4 -4
View File
@@ -2716,7 +2716,7 @@ void Spell::DoCreateItem(uint32 i, uint32 itemtype)
// we succeeded in creating at least one item, so a levelup is possible
player->UpdateCraftSkill(m_spellInfo->Id);
}
}
}
void Spell::EffectCreateItem(uint32 i)
@@ -3920,7 +3920,7 @@ void Spell::EffectSummonPet(uint32 i)
Pet* pet = owner->SummonPet(petentry, x, y, z, owner->GetOrientation(), SUMMON_PET, 0);
if(!pet)
return;
if(m_caster->GetTypeId() == TYPEID_UNIT)
{
if ( ((Creature*)m_caster)->isTotem() )
@@ -4572,7 +4572,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
{
if(!unitTarget)
return;
switch(((Player*)unitTarget)->GetBaseSkillValue(762))
{
case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;;
@@ -4607,7 +4607,7 @@ void Spell::EffectScriptEffect(uint32 effIndex)
int bag=19;
int slot=0;
Item* item = NULL;
while (bag < 256)
{
item = ((Player*)m_caster)->GetItemByPos(bag,slot);
src/game/SpellMgr.cpp
+1 -1
View File
@@ -1691,7 +1691,7 @@ void SpellMgr::LoadSpellChains()
bar.step();
RankErrorMap.insert(std::pair<char const *, std::multimap<SpellRankEntry, SpellRankValue>::iterator>(itr2->second.Rank,itr2));
}
bool error=false;
//if strict == true strict check is not needed
if (!itr->second.strict)
src/game/TicketHandler.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2005-2009 MaNGOS
* Copyright (C) 2005-2009 MaNGOS
*
* Copyright (C) 2008-2009 Trinity
* Copyright (C) 2008-2009 Trinity
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
src/game/TicketMgr.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2005-2009 MaNGOS
* Copyright (C) 2005-2009 MaNGOS
*
* Copyright (C) 2008-2009 Trinity
* Copyright (C) 2008-2009 Trinity
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
src/game/TicketMgr.h
+2 -2
View File
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2005-2009 MaNGOS
* Copyright (C) 2005-2009 MaNGOS
*
* Copyright (C) 2008-2009 Trinity
* Copyright (C) 2008-2009 Trinity
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
src/game/Unit.cpp
+8 -8
View File
@@ -3155,7 +3155,7 @@ uint32 Unit::GetWeaponSkillValue (WeaponAttackType attType, Unit const* target)
if(attType != BASE_ATTACK && !item )
{
if(attType == RANGED_ATTACK && getClass() == CLASS_PALADIN) //hammer
return GetMaxSkillValueForLevel();
return GetMaxSkillValueForLevel();
return 0;
}
@@ -3232,7 +3232,7 @@ void Unit::_UpdateSpells( uint32 time )
if ((*i).second)
{
if ( !(*i).second->GetAuraDuration() && !((*i).second->IsPermanent() || ((*i).second->IsPassive())) )
{
{
RemoveAura(i, AURA_REMOVE_BY_EXPIRE);
}
else
@@ -3761,7 +3761,7 @@ bool Unit::AddAura(Aura *Aur)
m_interruptableAuras.push_back(Aur);
AddInterruptMask(Aur->GetSpellProto()->AuraInterruptFlags);
}
if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE
if((Aur->GetSpellProto()->Attributes & SPELL_ATTR_BREAKABLE_BY_DAMAGE
&& !Aur->IsAuraType(SPELL_AURA_MOD_POSSESS)) //only dummy aura is breakable
|| (Aur->GetSpellProto()->Mechanic==MECHANIC_KNOCKOUT && Aur->IsAuraType(SPELL_AURA_MOD_STUN)))
{
@@ -6071,7 +6071,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
return false;
}
// Totemic Power (The Earthshatterer set)
case 28823:
case 28823:
{
if( !pVictim )
return false;
@@ -6437,7 +6437,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
Unit::AuraEffectList const& decSpeedList = pVictim->GetAurasByType(SPELL_AURA_PERIODIC_DAMAGE);
for(Unit::AuraEffectList::const_iterator iter = decSpeedList.begin(); iter != decSpeedList.end(); ++iter)
{
if((*iter)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DEATHKNIGHT
if((*iter)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_DEATHKNIGHT
&& (*iter)->GetCasterGUID() == GetGUID()
&& (*iter)->GetSpellProto()->Dispel == DISPEL_DISEASE)
{
@@ -8091,7 +8091,7 @@ void Unit::SetCharm(Unit* charm, bool apply)
if(!charm->RemoveUInt64Value(UNIT_FIELD_CHARMEDBY, GetGUID()))
sLog.outCrash("Unit %u is being uncharmed, but it has another charmer %u", charm->GetEntry(), charm->GetCharmerGUID());
m_Controlled.erase(charm);
}
}
@@ -8122,11 +8122,11 @@ void Unit::RemoveAllControlled()
{
target->RemoveCharmAuras();
}
else if(target->GetOwnerGUID() == GetGUID()
else if(target->GetOwnerGUID() == GetGUID()
&& target->GetTypeId() == TYPEID_UNIT
&& ((Creature*)target)->HasSummonMask(SUMMON_MASK_SUMMON))
{
if(!((TempSummon*)target)->isPet())
((TempSummon*)target)->UnSummon();
}