mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7745] Fixed gcc warnings.

Browse source
This commit is contained in:
AlexDereka 2009-05-02 23:08:43 +04:00
parent 8d3585f5ee
commit 27fabf7ace
24 changed files with 145 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/FleeingMovementGenerator.h
View file

@ -53,8 +53,8 @@ class MANGOS_DLL_SPEC FleeingMovementGenerator
float i_last_distance_from_caster;
float i_to_distance_from_caster;
float i_cur_angle;
TimeTracker i_nextCheckTime;
uint64 i_frightGUID;
TimeTracker i_nextCheckTime;
DestinationHolder< Traveller<T> > i_destinationHolder;
};

1
src/game/GroupHandler.cpp
View file

@ -196,7 +196,6 @@ void WorldSession::HandleGroupAcceptOpcode( WorldPacket & /*recv_data*/ )
if(!group->AddMember(GetPlayer()->GetGUID(), GetPlayer()->GetName()))
return;
uint8 subgroup = group->GetMemberGroup(GetPlayer()->GetGUID());
}
void WorldSession::HandleGroupDeclineOpcode( WorldPacket & /*recv_data*/ )

10
src/game/Level3.cpp
View file

@ -665,7 +665,7 @@ bool ChatHandler::HandleReloadSpellScriptsCommand(const char* arg)
return true;
}
bool ChatHandler::HandleReloadDbScriptStringCommand(const char* arg)
bool ChatHandler::HandleReloadDbScriptStringCommand(const char* /*arg*/)
{
sLog.outString( "Re-Loading Script strings from `db_script_string`...");
objmgr.LoadDbScriptStrings();
@ -1998,7 +1998,7 @@ bool ChatHandler::HandleAddItemCommand(const char* args)
if(args[0]=='[') // [name] manual form
{
char* citemName = citemName = strtok((char*)args, "]");
char* citemName = strtok((char*)args, "]");
if(citemName && citemName[0])
{
@ -3411,7 +3411,7 @@ bool ChatHandler::HandleDamageCommand(const char * args)
if(!spellid || !sSpellStore.LookupEntry(spellid))
return false;
m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage, false);
m_session->GetPlayer()->SpellNonMeleeDamageLog(target, spellid, damage);
return true;
}
@ -4911,7 +4911,7 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
return true;
}
bool ChatHandler::HandleServerShutDownCancelCommand(const char* args)
bool ChatHandler::HandleServerShutDownCancelCommand(const char* /*args*/)
{
sWorld.ShutdownCancel();
return true;
@ -4928,7 +4928,7 @@ bool ChatHandler::HandleServerShutDownCommand(const char* args)
int32 time = atoi (time_str);
///- Prevent interpret wrong arg value as 0 secs shutdown time
if(time == 0 && (time_str[0]!='0' || time_str[1]!='\0') || time < 0)
if ((time == 0 && (time_str[0]!='0' || time_str[1]!='\0')) || time < 0)
return false;
if (exitcode_str)

7
src/game/Map.cpp
View file

@ -183,8 +183,9 @@ void Map::DeleteStateMachine()
Map::Map(uint32 id, time_t expiry, uint32 InstanceId, uint8 SpawnMode)
: i_mapEntry (sMapStore.LookupEntry(id)), i_spawnMode(SpawnMode),
i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0), i_gridExpiry(expiry),
m_activeNonPlayersIter(m_activeNonPlayers.end())
i_id(id), i_InstanceId(InstanceId), m_unloadTimer(0),
m_activeNonPlayersIter(m_activeNonPlayers.end()),
i_gridExpiry(expiry)
{
for(unsigned int idx=0; idx < MAX_NUMBER_OF_GRIDS; ++idx)
{
@ -1226,7 +1227,7 @@ uint16 GridMap::getArea(float x, float y)
return m_area_map[lx*16 + ly];
}
float GridMap::getHeightFromFlat(float x, float y) const
float GridMap::getHeightFromFlat(float /*x*/, float /*y*/) const
{
return m_gridHeight;
}

2
src/game/MotionMaster.cpp
View file

@ -397,6 +397,8 @@ void MotionMaster::Mutate(MovementGenerator *m)
// DistractMovement interrupted by any other movement
case DISTRACT_MOTION_TYPE:
MovementExpired(false);
default:
break;
}
}
m->Initialize(*i_owner);

10
src/game/Object.cpp
View file

@ -173,6 +173,8 @@ void Object::BuildCreateUpdateBlockForPlayer(UpdateData *data, Player *target) c
case GAMEOBJECT_TYPE_TRANSPORT:
flags |= UPDATEFLAG_TRANSPORT;
break;
default:
break;
}
}
@ -608,10 +610,10 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
*data << uint32(m_floatValues[ index ] < 0 ? 0 : m_floatValues[ index ]);
}
// there are some float values which may be negative or can't get negative due to other checks
else if(index >= UNIT_FIELD_NEGSTAT0 && index <= UNIT_FIELD_NEGSTAT4 ||
index >= UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + 6) ||
index >= UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + 6) ||
index >= UNIT_FIELD_POSSTAT0 && index <= UNIT_FIELD_POSSTAT4)
else if ((index >= UNIT_FIELD_NEGSTAT0 && index <= UNIT_FIELD_NEGSTAT4) ||
(index >= UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSPOSITIVE + 6)) ||
(index >= UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE && index <= (UNIT_FIELD_RESISTANCEBUFFMODSNEGATIVE + 6)) ||
(index >= UNIT_FIELD_POSSTAT0 && index <= UNIT_FIELD_POSSTAT4))
{
*data << uint32(m_floatValues[ index ]);
}

8
src/game/ObjectMgr.cpp
View file

@ -4847,8 +4847,10 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
if(MapId != entry->map_id)
{
// if find graveyard at different map from where entrance placed (or no entrance data), use any first
if (!mapEntry || mapEntry->entrance_map < 0 || mapEntry->entrance_map != entry->map_id ||
mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0)
if (!mapEntry ||
mapEntry->entrance_map < 0 ||
mapEntry->entrance_map != entry->map_id ||
(mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0))
{
// not have any corrdinates for check distance anyway
entryFar = entry;
@ -6815,6 +6817,8 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
}
break;
}
case CONDITION_NONE:
break;
}
return true;
}

4
src/game/Pet.cpp
View file

@ -38,8 +38,8 @@ char const* petTypeSuffix[MAX_PET_TYPE] =
};
Pet::Pet(PetType type) :
Creature(), m_petType(type), m_removed(false), m_happinessTimer(7500), m_duration(0), m_bonusdamage(0),
m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0), m_auraUpdateMask(0), m_loading(false),
Creature(), m_removed(false), m_petType(type), m_happinessTimer(7500), m_duration(0), m_resetTalentsCost(0),
m_bonusdamage(0), m_resetTalentsTime(0), m_usedTalentCount(0), m_auraUpdateMask(0), m_loading(false),
m_declinedname(NULL)
{
m_isPet = true;

2
src/game/PetAI.h
View file

@ -48,8 +48,8 @@ class MANGOS_DLL_DECL PetAI : public CreatureAI
void UpdateAllies();
bool inCombat;
TimeTracker i_tracker;
bool inCombat;
std::set<uint64> m_AllySet;
uint32 m_updateAlliesTimer;

9
src/game/Player.cpp
View file

@ -1872,6 +1872,7 @@ void Player::Regenerate(Powers power)
} break;
case POWER_FOCUS:
case POWER_HAPPINESS:
case POWER_HEALTH:
break;
}
@ -4821,6 +4822,8 @@ void Player::ApplyRatingMod(CombatRating cr, int32 value, bool apply)
UpdateExpertise(OFF_ATTACK);
}
break;
case CR_ARMOR_PENETRATION:
break;
}
}
@ -5620,7 +5623,7 @@ uint32 Player::TeamForRace(uint8 race)
case 1: return HORDE;
}
sLog.outError("Race %u have wrong team id in DBC: wrong DBC files?",uint32(race),rEntry->TeamID);
sLog.outError("Race %u have wrong teamid %u in DBC: wrong DBC files?",uint32(race),rEntry->TeamID);
return ALLIANCE;
}
@ -9672,7 +9675,6 @@ uint8 Player::CanBankItem( uint8 bag, uint8 slot, ItemPosCountVec &dest, Item *p
if (!pItem->IsBag())
return EQUIP_ERR_ITEM_DOESNT_GO_TO_SLOT;
Bag *pBag = (Bag*)pItem;
if( !HasBankBagSlot( slot ) )
return EQUIP_ERR_MUST_PURCHASE_THAT_BAG_SLOT;
@ -13027,7 +13029,6 @@ void Player::AdjustQuestReqItemCount( Quest const* pQuest, QuestStatusData& ques
uint32 reqitemcount = pQuest->ReqItemCount[i];
if( reqitemcount != 0 )
{
uint32 quest_id = pQuest->GetQuestId();
uint32 curitemcount = GetItemCount(pQuest->ReqItemId[i],true);
questStatusData.m_itemcount[i] = std::min(curitemcount, reqitemcount);
@ -18530,7 +18531,7 @@ uint32 Player::GetResurrectionSpellId()
case 27239: spell_id = 27240; break; // rank 6
case 47883: spell_id = 47882; break; // rank 7
default:
sLog.outError("Unhandled spell %%u: S.Resurrection",(*itr)->GetId());
sLog.outError("Unhandled spell %u: S.Resurrection",(*itr)->GetId());
continue;
}

4
src/game/PointMovementGenerator.h
View file

@ -43,9 +43,9 @@ class MANGOS_DLL_SPEC PointMovementGenerator
bool GetDestination(float& x, float& y, float& z) const { x=i_x; y=i_y; z=i_z; return true; }
private:
TimeTracker i_nextMoveTime;
float i_x,i_y,i_z;
uint32 id;
float i_x,i_y,i_z;
TimeTracker i_nextMoveTime;
DestinationHolder< Traveller<T> > i_destinationHolder;
};
#endif

2
src/game/PoolHandler.cpp
View file

@ -322,7 +322,7 @@ bool PoolGroup<GameObject>::ReSpawn1Object(uint32 guid)
// Nothing to do for a child Pool
template <>
bool PoolGroup<Pool>::ReSpawn1Object(uint32 guid)
bool PoolGroup<Pool>::ReSpawn1Object(uint32 /*guid*/)
{
return true;
}

2
src/game/SkillDiscovery.cpp
View file

@ -91,7 +91,7 @@ void LoadSkillDiscoveryTable()
// explicit discovery ability
!IsExplicitDiscoverySpell(spellEntry))
{
sLog.outErrorDb("Spell (ID: %u) not have have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc and not 100% chance random discovery ability but listed in `skill_discovery_template` table",spellId);
sLog.outErrorDb("Spell (ID: %u) not have have MECHANIC_DISCOVERY (28) value in Mechanic field in spell.dbc and not 100%% chance random discovery ability but listed in `skill_discovery_template` table",spellId);
continue;
}

4
src/game/SocialMgr.cpp
View file

@ -240,6 +240,8 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr
case FRIEND_ADDED_ONLINE:
data << fi.Note;
break;
default:
break;
}
switch(result)
@ -251,6 +253,8 @@ void SocialMgr::SendFriendStatus(Player *player, FriendsResult result, uint32 fr
data << uint32(fi.Level);
data << uint32(fi.Class);
break;
default:
break;
}
if(broadcast)

6
src/game/Spell.cpp
View file

@ -2877,6 +2877,8 @@ void Spell::SendCastResult(SpellCastResult result)
data << uint32(m_spellInfo->EquippedItemSubClassMask);
//data << uint32(m_spellInfo->EquippedItemInventoryTypeMask);
break;
default:
break;
}
((Player*)m_caster)->GetSession()->SendPacket(&data);
}
@ -2895,8 +2897,6 @@ void Spell::SendSpellStart()
if(m_spellInfo->runeCostID)
castFlags |= CAST_FLAG_UNKNOWN10;
Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster;
WorldPacket data(SMSG_SPELL_START, (8+8+4+4+2));
if(m_CastItem)
data.append(m_CastItem->GetPackGUID());
@ -2943,8 +2943,6 @@ void Spell::SendSpellGo()
sLog.outDebug("Sending SMSG_SPELL_GO id=%u", m_spellInfo->Id);
Unit *target = m_targets.getUnitTarget() ? m_targets.getUnitTarget() : m_caster;
uint32 castFlags = CAST_FLAG_UNKNOWN3;
if(IsRangedSpell())
castFlags |= CAST_FLAG_AMMO; // arrows/bullets visual

151
src/game/SpellAuras.cpp
View file

@ -343,11 +343,11 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
static AuraType const frozenAuraTypes[] = { SPELL_AURA_MOD_ROOT, SPELL_AURA_MOD_STUN, SPELL_AURA_NONE };
Aura::Aura(SpellEntry const* spellproto, uint32 eff, int32 *currentBasePoints, Unit *target, Unit *caster, Item* castItem) :
m_spellmod(NULL), m_caster_guid(0), m_castItemGuid(castItem?castItem->GetGUID():0), m_target(target),
m_spellmod(NULL), m_caster_guid(0), m_target(target), m_castItemGuid(castItem?castItem->GetGUID():0),
m_timeCla(1000), m_periodicTimer(0), m_removeMode(AURA_REMOVE_BY_DEFAULT), m_AuraDRGroup(DIMINISHING_NONE),
m_effIndex(eff), m_auraSlot(MAX_AURAS), m_auraFlags(AFLAG_NONE), m_auraLevel(1), m_procCharges(0), m_stackAmount(1),
m_positive(false), m_permanent(false), m_isPeriodic(false), m_isAreaAura(false), m_isPersistent(false),
m_updated(false), m_isRemovedOnShapeLost(true), m_in_use(false)
m_isRemovedOnShapeLost(true), m_updated(false), m_in_use(false)
{
assert(target);
@ -695,7 +695,6 @@ void AreaAura::Update(uint32 diff)
if( pGroup)
{
uint8 subgroup = ((Player*)owner)->GetSubGroup();
for(GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player* Target = itr->getSource();
@ -1299,7 +1298,7 @@ void Aura::HandleAddModifier(bool apply, bool Real)
m_target->CastSpell(m_target,45471,true);
}
}
void Aura::HandleAddTargetTrigger(bool apply, bool Real)
void Aura::HandleAddTargetTrigger(bool apply, bool /*Real*/)
{
// Use SpellModifier structure for check
// used only fields:
@ -2550,7 +2549,7 @@ void Aura::HandleAuraHover(bool apply, bool Real)
m_target->SendMessageToSet(&data,true);
}
void Aura::HandleWaterBreathing(bool apply, bool Real)
void Aura::HandleWaterBreathing(bool /*apply*/, bool /*Real*/)
{
// update timers in client
if(m_target->GetTypeId()==TYPEID_PLAYER)
@ -2957,7 +2956,7 @@ void Aura::HandleForceReaction(bool apply, bool Real)
player->GetReputationMgr().SendForceReactions();
}
void Aura::HandleAuraModSkill(bool apply, bool Real)
void Aura::HandleAuraModSkill(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -3010,7 +3009,7 @@ void Aura::HandleChannelDeathItem(bool apply, bool Real)
}
}
void Aura::HandleBindSight(bool apply, bool Real)
void Aura::HandleBindSight(bool apply, bool /*Real*/)
{
Unit* caster = GetCaster();
if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
@ -3019,7 +3018,7 @@ void Aura::HandleBindSight(bool apply, bool Real)
((Player*)caster)->SetFarSightGUID(apply ? m_target->GetGUID() : 0);
}
void Aura::HandleFarSight(bool apply, bool Real)
void Aura::HandleFarSight(bool apply, bool /*Real*/)
{
Unit* caster = GetCaster();
if(!caster || caster->GetTypeId() != TYPEID_PLAYER)
@ -3028,7 +3027,7 @@ void Aura::HandleFarSight(bool apply, bool Real)
((Player*)caster)->SetFarSightGUID(apply ? m_target->GetGUID() : 0);
}
void Aura::HandleAuraTrackCreatures(bool apply, bool Real)
void Aura::HandleAuraTrackCreatures(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -3038,7 +3037,7 @@ void Aura::HandleAuraTrackCreatures(bool apply, bool Real)
m_target->SetUInt32Value(PLAYER_TRACK_CREATURES, apply ? ((uint32)1)<<(m_modifier.m_miscvalue-1) : 0 );
}
void Aura::HandleAuraTrackResources(bool apply, bool Real)
void Aura::HandleAuraTrackResources(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -3048,7 +3047,7 @@ void Aura::HandleAuraTrackResources(bool apply, bool Real)
m_target->SetUInt32Value(PLAYER_TRACK_RESOURCES, apply ? ((uint32)1)<<(m_modifier.m_miscvalue-1): 0 );
}
void Aura::HandleAuraTrackStealthed(bool apply, bool Real)
void Aura::HandleAuraTrackStealthed(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -3059,7 +3058,7 @@ void Aura::HandleAuraTrackStealthed(bool apply, bool Real)
m_target->ApplyModFlag(PLAYER_FIELD_BYTES,PLAYER_FIELD_BYTE_TRACK_STEALTHED,apply);
}
void Aura::HandleAuraModScale(bool apply, bool Real)
void Aura::HandleAuraModScale(bool apply, bool /*Real*/)
{
m_target->ApplyPercentModFloatValue(OBJECT_FIELD_SCALE_X,m_modifier.m_amount,apply);
}
@ -3187,7 +3186,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
}
}
void Aura::HandleAuraModPetTalentsPoints(bool Apply, bool Real)
void Aura::HandleAuraModPetTalentsPoints(bool /*Apply*/, bool Real)
{
if(!Real)
return;
@ -3682,7 +3681,6 @@ void Aura::HandleAuraModRoot(bool apply, bool Real)
if(!Real)
return;
uint32 apply_stat = UNIT_STAT_ROOT;
if (apply)
{
// Frost root aura -> freeze/unfreeze target
@ -3980,7 +3978,7 @@ void Aura::HandleAuraModUseNormalSpeed(bool /*apply*/, bool Real)
/*** IMMUNITY ***/
/*********************************************************/
void Aura::HandleModMechanicImmunity(bool apply, bool Real)
void Aura::HandleModMechanicImmunity(bool apply, bool /*Real*/)
{
uint32 mechanic = 1 << m_modifier.m_miscvalue;
@ -4057,7 +4055,7 @@ void Aura::HandleModMechanicImmunity(bool apply, bool Real)
}
//this method is called whenever we add / remove aura which gives m_target some imunity to some spell effect
void Aura::HandleAuraModEffectImmunity(bool apply, bool Real)
void Aura::HandleAuraModEffectImmunity(bool apply, bool /*Real*/)
{
// when removing flag aura, handle flag drop
if( !apply && m_target->GetTypeId() == TYPEID_PLAYER
@ -4133,7 +4131,7 @@ void Aura::HandleAuraModSchoolImmunity(bool apply, bool Real)
}
}
void Aura::HandleAuraModDmgImmunity(bool apply, bool Real)
void Aura::HandleAuraModDmgImmunity(bool apply, bool /*Real*/)
{
m_target->ApplySpellImmune(GetId(),IMMUNITY_DAMAGE,m_modifier.m_miscvalue,apply);
}
@ -4165,7 +4163,7 @@ void Aura::HandleAuraProcTriggerSpell(bool apply, bool Real)
}
}
void Aura::HandleAuraModStalked(bool apply, bool Real)
void Aura::HandleAuraModStalked(bool apply, bool /*Real*/)
{
// used by spells: Hunter's Mark, Mind Vision, Syndicate Tracker (MURP) DND
if(apply)
@ -4178,7 +4176,7 @@ void Aura::HandleAuraModStalked(bool apply, bool Real)
/*** PERIODIC ***/
/*********************************************************/
void Aura::HandlePeriodicTriggerSpell(bool apply, bool Real)
void Aura::HandlePeriodicTriggerSpell(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
if (m_spellProto->Id == 66 && !apply)
@ -4188,7 +4186,7 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool Real)
}
}
void Aura::HandlePeriodicTriggerSpellWithValue(bool apply, bool Real)
void Aura::HandlePeriodicTriggerSpellWithValue(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
@ -4207,7 +4205,7 @@ void Aura::HandlePeriodicEnergize(bool apply, bool Real)
m_modifier.m_amount = m_target->GetMaxPower(POWER_MANA) * 25 / 10000;
}
void Aura::HandleAuraPowerBurn(bool apply, bool Real)
void Aura::HandleAuraPowerBurn(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
@ -4252,7 +4250,7 @@ void Aura::HandleAuraPeriodicDummy(bool apply, bool Real)
m_isPeriodic = apply;
}
void Aura::HandlePeriodicHeal(bool apply, bool Real)
void Aura::HandlePeriodicHeal(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
@ -4418,22 +4416,22 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
}
}
void Aura::HandlePeriodicDamagePCT(bool apply, bool Real)
void Aura::HandlePeriodicDamagePCT(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
void Aura::HandlePeriodicLeech(bool apply, bool Real)
void Aura::HandlePeriodicLeech(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
void Aura::HandlePeriodicManaLeech(bool apply, bool Real)
void Aura::HandlePeriodicManaLeech(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
void Aura::HandlePeriodicHealthFunnel(bool apply, bool Real)
void Aura::HandlePeriodicHealthFunnel(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
@ -4446,7 +4444,7 @@ void Aura::HandlePeriodicHealthFunnel(bool apply, bool Real)
/*** RESISTANCE ***/
/********************************/
void Aura::HandleAuraModResistanceExclusive(bool apply, bool Real)
void Aura::HandleAuraModResistanceExclusive(bool apply, bool /*Real*/)
{
for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
{
@ -4459,7 +4457,7 @@ void Aura::HandleAuraModResistanceExclusive(bool apply, bool Real)
}
}
void Aura::HandleAuraModResistance(bool apply, bool Real)
void Aura::HandleAuraModResistance(bool apply, bool /*Real*/)
{
for(int8 x = SPELL_SCHOOL_NORMAL; x < MAX_SPELL_SCHOOL;x++)
{
@ -4472,7 +4470,7 @@ void Aura::HandleAuraModResistance(bool apply, bool Real)
}
}
void Aura::HandleAuraModBaseResistancePCT(bool apply, bool Real)
void Aura::HandleAuraModBaseResistancePCT(bool apply, bool /*Real*/)
{
// only players have base stats
if(m_target->GetTypeId() != TYPEID_PLAYER)
@ -4491,7 +4489,7 @@ void Aura::HandleAuraModBaseResistancePCT(bool apply, bool Real)
}
}
void Aura::HandleModResistancePercent(bool apply, bool Real)
void Aura::HandleModResistancePercent(bool apply, bool /*Real*/)
{
for(int8 i = SPELL_SCHOOL_NORMAL; i < MAX_SPELL_SCHOOL; i++)
{
@ -4507,7 +4505,7 @@ void Aura::HandleModResistancePercent(bool apply, bool Real)
}
}
void Aura::HandleModBaseResistance(bool apply, bool Real)
void Aura::HandleModBaseResistance(bool apply, bool /*Real*/)
{
// only players have base stats
if(m_target->GetTypeId() != TYPEID_PLAYER)
@ -4528,7 +4526,7 @@ void Aura::HandleModBaseResistance(bool apply, bool Real)
/*** STAT ***/
/********************************/
void Aura::HandleAuraModStat(bool apply, bool Real)
void Aura::HandleAuraModStat(bool apply, bool /*Real*/)
{
if (m_modifier.m_miscvalue < -2 || m_modifier.m_miscvalue > 4)
{
@ -4549,7 +4547,7 @@ void Aura::HandleAuraModStat(bool apply, bool Real)
}
}
void Aura::HandleModPercentStat(bool apply, bool Real)
void Aura::HandleModPercentStat(bool apply, bool /*Real*/)
{
if (m_modifier.m_miscvalue < -1 || m_modifier.m_miscvalue > 4)
{
@ -4568,7 +4566,7 @@ void Aura::HandleModPercentStat(bool apply, bool Real)
}
}
void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool Real)
void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4579,7 +4577,7 @@ void Aura::HandleModSpellDamagePercentFromStat(bool /*apply*/, bool Real)
((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
}
void Aura::HandleModSpellHealingPercentFromStat(bool /*apply*/, bool Real)
void Aura::HandleModSpellHealingPercentFromStat(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4597,7 +4595,7 @@ void Aura::HandleAuraModDispelResist(bool apply, bool Real)
m_target->CastSpell(m_target,44416,true,NULL,this,GetCasterGUID());
}
void Aura::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool Real)
void Aura::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4608,7 +4606,7 @@ void Aura::HandleModSpellDamagePercentFromAttackPower(bool /*apply*/, bool Real)
((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
}
void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool Real)
void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4617,7 +4615,7 @@ void Aura::HandleModSpellHealingPercentFromAttackPower(bool /*apply*/, bool Real
((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
}
void Aura::HandleModHealingDone(bool /*apply*/, bool Real)
void Aura::HandleModHealingDone(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4626,7 +4624,7 @@ void Aura::HandleModHealingDone(bool /*apply*/, bool Real)
((Player*)m_target)->UpdateSpellDamageAndHealingBonus();
}
void Aura::HandleModTotalPercentStat(bool apply, bool Real)
void Aura::HandleModTotalPercentStat(bool apply, bool /*Real*/)
{
if (m_modifier.m_miscvalue < -1 || m_modifier.m_miscvalue > 4)
{
@ -4657,7 +4655,7 @@ void Aura::HandleModTotalPercentStat(bool apply, bool Real)
}
}
void Aura::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool Real)
void Aura::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -4677,12 +4675,12 @@ void Aura::HandleAuraModResistenceOfStatPercent(bool /*apply*/, bool Real)
/********************************/
/*** HEAL & ENERGIZE ***/
/********************************/
void Aura::HandleAuraModTotalHealthPercentRegen(bool apply, bool Real)
void Aura::HandleAuraModTotalHealthPercentRegen(bool apply, bool /*Real*/)
{
m_isPeriodic = apply;
}
void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool Real)
void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool /*Real*/)
{
if(m_modifier.periodictime == 0)
m_modifier.periodictime = 1000;
@ -4691,7 +4689,7 @@ void Aura::HandleAuraModTotalManaPercentRegen(bool apply, bool Real)
m_isPeriodic = apply;
}
void Aura::HandleModRegen(bool apply, bool Real) // eating
void Aura::HandleModRegen(bool apply, bool /*Real*/) // eating
{
if(m_modifier.periodictime == 0)
m_modifier.periodictime = 5000;
@ -4750,7 +4748,7 @@ void Aura::HandleModManaRegen(bool /*apply*/, bool Real)
((Player*)m_target)->UpdateManaRegen();
}
void Aura::HandleComprehendLanguage(bool apply, bool Real)
void Aura::HandleComprehendLanguage(bool apply, bool /*Real*/)
{
if(apply)
m_target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_COMPREHEND_LANG);
@ -4793,7 +4791,7 @@ void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real)
m_target->HandleStatModifier(UNIT_MOD_HEALTH, TOTAL_VALUE, float(m_modifier.m_amount), apply);
}
void Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool Real)
void Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool /*Real*/)
{
uint32 oldhealth = m_target->GetHealth();
double healthPercentage = (double)oldhealth / (double)m_target->GetMaxHealth();
@ -4811,7 +4809,7 @@ void Aura::HandleAuraModIncreaseMaxHealth(bool apply, bool Real)
}
}
void Aura::HandleAuraModIncreaseEnergy(bool apply, bool Real)
void Aura::HandleAuraModIncreaseEnergy(bool apply, bool /*Real*/)
{
Powers powerType = m_target->getPowerType();
if(int32(powerType) != m_modifier.m_miscvalue)
@ -4847,7 +4845,7 @@ void Aura::HandleAuraIncreaseBaseHealthPercent(bool apply, bool /*Real*/)
/*** FIGHT ***/
/********************************/
void Aura::HandleAuraModParryPercent(bool /*apply*/, bool Real)
void Aura::HandleAuraModParryPercent(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -4855,7 +4853,7 @@ void Aura::HandleAuraModParryPercent(bool /*apply*/, bool Real)
((Player*)m_target)->UpdateParryPercentage();
}
void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool Real)
void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -4864,7 +4862,7 @@ void Aura::HandleAuraModDodgePercent(bool /*apply*/, bool Real)
//sLog.outError("BONUS DODGE CHANCE: + %f", float(m_modifier.m_amount));
}
void Aura::HandleAuraModBlockPercent(bool /*apply*/, bool Real)
void Aura::HandleAuraModBlockPercent(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId()!=TYPEID_PLAYER)
return;
@ -4914,7 +4912,7 @@ void Aura::HandleAuraModCritPercent(bool apply, bool Real)
}
}
void Aura::HandleModHitChance(bool apply, bool Real)
void Aura::HandleModHitChance(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() == TYPEID_PLAYER)
{
@ -4928,7 +4926,7 @@ void Aura::HandleModHitChance(bool apply, bool Real)
}
}
void Aura::HandleModSpellHitChance(bool apply, bool Real)
void Aura::HandleModSpellHitChance(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() == TYPEID_PLAYER)
{
@ -4974,19 +4972,19 @@ void Aura::HandleModSpellCritChanceShool(bool /*apply*/, bool Real)
/*** ATTACK SPEED ***/
/********************************/
void Aura::HandleModCastingSpeed(bool apply, bool Real)
void Aura::HandleModCastingSpeed(bool apply, bool /*Real*/)
{
m_target->ApplyCastTimePercentMod(m_modifier.m_amount,apply);
}
void Aura::HandleModMeleeRangedSpeedPct(bool apply, bool Real)
void Aura::HandleModMeleeRangedSpeedPct(bool apply, bool /*Real*/)
{
m_target->ApplyAttackTimePercentMod(BASE_ATTACK,m_modifier.m_amount,apply);
m_target->ApplyAttackTimePercentMod(OFF_ATTACK,m_modifier.m_amount,apply);
m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_modifier.m_amount, apply);
}
void Aura::HandleModCombatSpeedPct(bool apply, bool Real)
void Aura::HandleModCombatSpeedPct(bool apply, bool /*Real*/)
{
m_target->ApplyCastTimePercentMod(m_modifier.m_amount,apply);
m_target->ApplyAttackTimePercentMod(BASE_ATTACK,m_modifier.m_amount,apply);
@ -4994,7 +4992,7 @@ void Aura::HandleModCombatSpeedPct(bool apply, bool Real)
m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_modifier.m_amount, apply);
}
void Aura::HandleModAttackSpeed(bool apply, bool Real)
void Aura::HandleModAttackSpeed(bool apply, bool /*Real*/)
{
if(!m_target->isAlive() )
return;
@ -5002,19 +5000,19 @@ void Aura::HandleModAttackSpeed(bool apply, bool Real)
m_target->ApplyAttackTimePercentMod(BASE_ATTACK,m_modifier.m_amount,apply);
}
void Aura::HandleHaste(bool apply, bool Real)
void Aura::HandleHaste(bool apply, bool /*Real*/)
{
m_target->ApplyAttackTimePercentMod(BASE_ATTACK, m_modifier.m_amount,apply);
m_target->ApplyAttackTimePercentMod(OFF_ATTACK, m_modifier.m_amount,apply);
m_target->ApplyAttackTimePercentMod(RANGED_ATTACK,m_modifier.m_amount,apply);
}
void Aura::HandleAuraModRangedHaste(bool apply, bool Real)
void Aura::HandleAuraModRangedHaste(bool apply, bool /*Real*/)
{
m_target->ApplyAttackTimePercentMod(RANGED_ATTACK, m_modifier.m_amount, apply);
}
void Aura::HandleRangedAmmoHaste(bool apply, bool Real)
void Aura::HandleRangedAmmoHaste(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -5025,12 +5023,12 @@ void Aura::HandleRangedAmmoHaste(bool apply, bool Real)
/*** ATTACK POWER ***/
/********************************/
void Aura::HandleAuraModAttackPower(bool apply, bool Real)
void Aura::HandleAuraModAttackPower(bool apply, bool /*Real*/)
{
m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_VALUE, float(m_modifier.m_amount), apply);
}
void Aura::HandleAuraModRangedAttackPower(bool apply, bool Real)
void Aura::HandleAuraModRangedAttackPower(bool apply, bool /*Real*/)
{
if((m_target->getClassMask() & CLASSMASK_WAND_USERS)!=0)
return;
@ -5038,13 +5036,13 @@ void Aura::HandleAuraModRangedAttackPower(bool apply, bool Real)
m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_VALUE, float(m_modifier.m_amount), apply);
}
void Aura::HandleAuraModAttackPowerPercent(bool apply, bool Real)
void Aura::HandleAuraModAttackPowerPercent(bool apply, bool /*Real*/)
{
//UNIT_FIELD_ATTACK_POWER_MULTIPLIER = multiplier - 1
m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER, TOTAL_PCT, float(m_modifier.m_amount), apply);
}
void Aura::HandleAuraModRangedAttackPowerPercent(bool apply, bool Real)
void Aura::HandleAuraModRangedAttackPowerPercent(bool apply, bool /*Real*/)
{
if((m_target->getClassMask() & CLASSMASK_WAND_USERS)!=0)
return;
@ -5053,7 +5051,7 @@ void Aura::HandleAuraModRangedAttackPowerPercent(bool apply, bool Real)
m_target->HandleStatModifier(UNIT_MOD_ATTACK_POWER_RANGED, TOTAL_PCT, float(m_modifier.m_amount), apply);
}
void Aura::HandleAuraModRangedAttackPowerOfStatPercent(bool apply, bool Real)
void Aura::HandleAuraModRangedAttackPowerOfStatPercent(bool /*apply*/, bool Real)
{
// spells required only Real aura add/remove
if(!Real)
@ -5064,7 +5062,7 @@ void Aura::HandleAuraModRangedAttackPowerOfStatPercent(bool apply, bool Real)
((Player*)m_target)->UpdateAttackPowerAndDamage(true);
}
void Aura::HandleAuraModAttackPowerOfStatPercent(bool apply, bool Real)
void Aura::HandleAuraModAttackPowerOfStatPercent(bool /*apply*/, bool Real)
{
// spells required only Real aura add/remove
if(!Real)
@ -5256,7 +5254,7 @@ void Aura::HandleModPowerCost(bool apply, bool Real)
m_target->ApplyModInt32Value(UNIT_FIELD_POWER_COST_MODIFIER+i,m_modifier.m_amount,apply);
}
void Aura::HandleNoReagentUseAura(bool Apply, bool Real)
void Aura::HandleNoReagentUseAura(bool /*Apply*/, bool Real)
{
// spells required only Real aura add/remove
if(!Real)
@ -5424,7 +5422,7 @@ void Aura::HandleShapeshiftBoosts(bool apply)
m_target->SetHealth(uint32(ceil((double)m_target->GetMaxHealth() * healthPercentage)));*/
}
void Aura::HandleAuraEmpathy(bool apply, bool Real)
void Aura::HandleAuraEmpathy(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_UNIT)
return;
@ -5434,7 +5432,7 @@ void Aura::HandleAuraEmpathy(bool apply, bool Real)
m_target->ApplyModUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_SPECIALINFO, apply);
}
void Aura::HandleAuraUntrackable(bool apply, bool Real)
void Aura::HandleAuraUntrackable(bool apply, bool /*Real*/)
{
if(apply)
m_target->SetByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
@ -5442,7 +5440,7 @@ void Aura::HandleAuraUntrackable(bool apply, bool Real)
m_target->RemoveByteFlag(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_UNTRACKABLE);
}
void Aura::HandleAuraModPacify(bool apply, bool Real)
void Aura::HandleAuraModPacify(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -5459,7 +5457,7 @@ void Aura::HandleAuraModPacifyAndSilence(bool apply, bool Real)
HandleAuraModSilence(apply,Real);
}
void Aura::HandleAuraGhost(bool apply, bool Real)
void Aura::HandleAuraGhost(bool apply, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -5529,7 +5527,7 @@ void Aura::HandleForceMoveForward(bool apply, bool Real)
m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FORCE_MOVE);
}
void Aura::HandleAuraModExpertise(bool /*apply*/, bool Real)
void Aura::HandleAuraModExpertise(bool /*apply*/, bool /*Real*/)
{
if(m_target->GetTypeId() != TYPEID_PLAYER)
return;
@ -5554,7 +5552,7 @@ void Aura::HandleModTargetResistance(bool apply, bool Real)
m_target->ApplyModInt32Value(PLAYER_FIELD_MOD_TARGET_RESISTANCE,m_modifier.m_amount, apply);
}
void Aura::HandleShieldBlockValue(bool apply, bool Real)
void Aura::HandleShieldBlockValue(bool apply, bool /*Real*/)
{
BaseModType modType = FLAT_MOD;
if(m_modifier.m_auraname == SPELL_AURA_MOD_SHIELD_BLOCKVALUE_PCT)
@ -5953,14 +5951,9 @@ void Aura::PeriodicTick()
if( BattleGround *bg = ((Player*)pCaster)->GetBattleGround() )
bg->UpdatePlayerScore(((Player*)pCaster), SCORE_HEALING_DONE, gain);
//Do check before because m_modifier.auraName can be invalidate by DealDamage.
bool procSpell = (m_modifier.m_auraname == SPELL_AURA_PERIODIC_HEAL && m_target != pCaster);
m_target->getHostilRefManager().threatAssist(pCaster, float(gain) * 0.5f, GetSpellProto());
Unit* target = m_target; // aura can be deleted in DealDamage
SpellEntry const* spellProto = GetSpellProto();
bool haveCastItem = GetCastItemGUID()!=0;
// heal for caster damage
if(m_target!=pCaster && spellProto->SpellVisual[0]==163)
@ -5990,8 +5983,8 @@ void Aura::PeriodicTick()
}
}
uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;// | PROC_FLAG_SUCCESSFUL_HEAL;
uint32 procVictim = 0;//ROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_TAKEN_HEAL;
// uint32 procAttacker = PROC_FLAG_ON_DO_PERIODIC;// | PROC_FLAG_SUCCESSFUL_HEAL;
// uint32 procVictim = 0;//ROC_FLAG_ON_TAKE_PERIODIC | PROC_FLAG_TAKEN_HEAL;
// ignore item heals
// if(procSpell && !haveCastItem)
// pCaster->ProcDamageAndSpell(target, procAttacker, procVictim, PROC_EX_NORMAL_HIT, pdamage, BASE_ATTACK, spellProto);
@ -6685,7 +6678,7 @@ void Aura::HandleArenaPreparation(bool apply, bool Real)
m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PREPARATION);
}
void Aura::HandleAuraControlVehicle(bool apply, bool Real)
void Aura::HandleAuraControlVehicle(bool /*apply*/, bool Real)
{
if(!Real)
return;

7
src/game/SpellEffects.cpp
View file

@ -2153,7 +2153,6 @@ void Spell::EffectTeleportUnits(uint32 i)
return;
}
// Init dest coordinates
uint32 mapid = m_caster->GetMapId();
float x = m_targets.m_destX;
float y = m_targets.m_destY;
float z = m_targets.m_destZ;
@ -2555,7 +2554,7 @@ void Spell::EffectHealthLeech(uint32 i)
int32 new_damage = int32(damage*multiplier);
uint32 curHealth = unitTarget->GetHealth();
new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage, m_IsTriggeredSpell, true);
new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage );
if(curHealth < new_damage)
new_damage = curHealth;
@ -2922,6 +2921,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
gameObjTarget->TriggeringLinkedGameObject(trapEntry,m_caster);
// Don't return, let loots been taken
default:
break;
}
}
@ -3846,7 +3847,7 @@ void Spell::EffectEnchantItemPrismatic(uint32 effect_idx)
}
if(!add_socket)
{
sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (u), not suppoted yet.",
sLog.outError("Spell::EffectEnchantItemPrismatic: attempt apply enchant spell %u with SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC (%u) but without ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET (%u), not suppoted yet.",
m_spellInfo->Id,SPELL_EFFECT_ENCHANT_ITEM_PRISMATIC,ITEM_ENCHANTMENT_TYPE_PRISMATIC_SOCKET);
return;
}

15
src/game/SpellMgr.cpp
View file

@ -502,6 +502,8 @@ bool IsSingleTargetSpell(SpellEntry const *spellInfo)
{
case SPELL_JUDGEMENT:
return true;
default:
break;
}
// single target triggered spell.
@ -531,6 +533,8 @@ bool IsSingleTargetSpells(SpellEntry const *spellInfo1, SpellEntry const *spellI
if(GetSpellSpecific(spellInfo2->Id) == spec1)
return true;
break;
default:
break;
}
return false;
@ -1136,12 +1140,13 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
case SPELLFAMILY_GENERIC: // same family case
{
// Thunderfury
if( spellInfo_1->Id == 21992 && spellInfo_2->Id == 27648 || spellInfo_2->Id == 21992 && spellInfo_1->Id == 27648 )
if ((spellInfo_1->Id == 21992 && spellInfo_2->Id == 27648) ||
(spellInfo_2->Id == 21992 && spellInfo_1->Id == 27648))
return false;
// Lightning Speed (Mongoose) and Fury of the Crashing Waves (Tsunami Talisman)
if( spellInfo_1->Id == 28093 && spellInfo_2->Id == 42084 ||
spellInfo_2->Id == 28093 && spellInfo_1->Id == 42084 )
if ((spellInfo_1->Id == 28093 && spellInfo_2->Id == 42084) ||
(spellInfo_2->Id == 28093 && spellInfo_1->Id == 42084))
return false;
// Soulstone Resurrection and Twisting Nether (resurrector)
@ -2789,6 +2794,8 @@ bool IsDiminishingReturnsGroupDurationLimited(DiminishingGroup group)
case DIMINISHING_BANISH:
case DIMINISHING_LIMITONLY:
return true;
default:
return false;
}
return false;
}
@ -2816,6 +2823,8 @@ DiminishingReturnsType GetDiminishingReturnsGroupType(DiminishingGroup group)
case DIMINISHING_WARLOCK_FEAR:
case DIMINISHING_KNOCKOUT:
return DRTYPE_PLAYER;
default:
break;
}
return DRTYPE_NONE;

5
src/game/ThreatManager.cpp
View file

@ -318,8 +318,9 @@ HostilReference* ThreatContainer::selectNextVictim(Creature* pAttacker, HostilRe
break;
}
if( currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() ||
currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat() && pAttacker->IsWithinDistInMap(target, ATTACK_DISTANCE) )
if ((currentRef->getThreat() > 1.3f * pCurrentVictim->getThreat() ||
currentRef->getThreat() > 1.1f * pCurrentVictim->getThreat()) &&
pAttacker->IsWithinDistInMap(target, ATTACK_DISTANCE))
{ //implement 110% threat rule for targets in melee range
found = true; //and 130% rule for targets in ranged distances
break; //for selecting alive targets

12
src/game/Unit.cpp
View file

@ -973,7 +973,7 @@ void Unit::CastSpell(float x, float y, float z, SpellEntry const *spellInfo, boo
}
// Obsolete func need remove, here only for comotability vs another patches
uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell, bool useSpellDamage)
uint32 Unit::SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage)
{
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
SpellNonMeleeDamage damageInfo(this, pVictim, spellInfo->Id, spellInfo->SchoolMask);
@ -2268,7 +2268,7 @@ void Unit::SendAttackStop(Unit* victim)
((Creature*)victim)->AI().EnterEvadeMode(this);*/
}
bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const *spellProto, WeaponAttackType attackType)
bool Unit::isSpellBlocked(Unit *pVictim, SpellEntry const * /*spellProto*/, WeaponAttackType attackType)
{
if (pVictim->HasInArc(M_PI,this))
{
@ -4345,7 +4345,7 @@ void Unit::SendAttackStateUpdate(uint32 HitInfo, Unit *target, uint8 SwingType,
SendMessageToSet( &data, true );
}
bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * procSpell, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
bool Unit::HandleHasteAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAura, SpellEntry const * /*procSpell*/, uint32 /*procFlag*/, uint32 /*procEx*/, uint32 cooldown)
{
SpellEntry const *hasteSpell = triggeredByAura->GetSpellProto();
@ -4655,7 +4655,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
break;
}
return false;
}/**/
}*/
// Sunwell Exalted Caster Neck (Shattered Sun Pendant of Acumen neck)
// cast 45479 Light's Wrath if Exalted by Aldor
// cast 45429 Arcane Bolt if Exalted by Scryers
@ -9939,6 +9939,7 @@ Powers Unit::GetPowerTypeByAuraGroup(UnitMods unitMod) const
case UNIT_MOD_HAPPINESS: return POWER_HAPPINESS;
case UNIT_MOD_RUNE: return POWER_RUNE;
case UNIT_MOD_RUNIC_POWER:return POWER_RUNIC_POWER;
default: return POWER_MANA;
}
return POWER_MANA;
@ -10162,6 +10163,8 @@ uint32 Unit::GetCreatePowers( Powers power ) const
case POWER_ENERGY: return 100;
case POWER_HAPPINESS: return (GetTypeId()==TYPEID_PLAYER || !((Creature const*)this)->isPet() || ((Pet const*)this)->getPetType()!=HUNTER_PET ? 0 : 1050000);
case POWER_RUNIC_POWER: return 1000;
case POWER_RUNE: return 0;
case POWER_HEALTH: return 0;
}
return 0;
@ -10574,7 +10577,6 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
Aura *triggeredByAura = i->triggeredByAura;
Modifier *auraModifier = triggeredByAura->GetModifier();
SpellEntry const *spellInfo = triggeredByAura->GetSpellProto();
uint32 effIndex = triggeredByAura->GetEffIndex();
bool useCharges = triggeredByAura->GetAuraCharges() > 0;
// For players set spell cooldown if need
uint32 cooldown = 0;

2
src/game/Unit.h
View file

@ -1049,7 +1049,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
void SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, bool critical = false);
void SendEnergizeSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage,Powers powertype);
uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage, bool isTriggeredSpell = false, bool useSpellDamage = true);
uint32 SpellNonMeleeDamageLog(Unit *pVictim, uint32 spellID, uint32 damage);
void CastSpell(Unit* Victim, uint32 spellId, bool triggered, Item *castItem = NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0);
void CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0);
void CastCustomSpell(Unit* Victim, uint32 spellId, int32 const* bp0, int32 const* bp1, int32 const* bp2, bool triggered, Item *castItem= NULL, Aura* triggeredByAura = NULL, uint64 originalCaster = 0);

2
src/game/UpdateData.cpp
View file

@ -101,7 +101,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
*dst_size = c_stream.total_out;
}
bool UpdateData::BuildPacket(WorldPacket *packet, bool hasTransport)
bool UpdateData::BuildPacket(WorldPacket *packet, bool /*hasTransport*/)
{
ByteBuffer buf(m_data.size() + 10 + m_outOfRangeGUIDs.size()*8);

4
src/mangosd/CliRunnable.cpp
View file

@ -153,7 +153,7 @@ bool ChatHandler::HandleCharacterDeleteCommand(const char* args)
}
/// Exit the realm
bool ChatHandler::HandleServerExitCommand(const char* args)
bool ChatHandler::HandleServerExitCommand(const char* /*args*/)
{
SendSysMessage(LANG_COMMAND_EXIT);
World::StopNow(SHUTDOWN_EXIT_CODE);
@ -161,7 +161,7 @@ bool ChatHandler::HandleServerExitCommand(const char* args)
}
/// Display info on users currently in the realm
bool ChatHandler::HandleAccountOnlineListCommand(const char* args)
bool ChatHandler::HandleAccountOnlineListCommand(const char* /*args*/)
{
///- Get the list of accounts ID logged to the realm
QueryResult *resultDB = CharacterDatabase.Query("SELECT name,account FROM characters WHERE online > 0");

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7744"
#define REVISION_NR "7745"
#endif // __REVISION_NR_H__