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

Core: Fix some warnings

Browse Source
This commit is contained in:
Spp
2011-01-11 11:18:00 +01:00
parent a039086bca
commit bd2728eb74
27 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Battlegrounds/Battleground.h
+2 -2
View File
@@ -539,9 +539,9 @@ class Battleground
virtual void EventPlayerUsedGO(Player* /*player*/, GameObject* /*go*/){}
// this function can be used by spell to interact with the BG map
virtual void DoAction(uint32 action, uint64 var) {}
virtual void DoAction(uint32 /*action*/, uint64 /*var*/) {}
virtual void HandlePlayerResurrect(Player* player) {}
virtual void HandlePlayerResurrect(Player* /*player*/) {}
/* Death related */
virtual WorldSafeLocsEntry const* GetClosestGraveYard(Player* player);
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+4 -4
View File
@@ -310,7 +310,7 @@ void BattlegroundIC::AddPlayer(Player *plr)
SendTransportInit(plr);
}
void BattlegroundIC::RemovePlayer(Player* plr,uint64 guid)
void BattlegroundIC::RemovePlayer(Player* plr, uint64 /*guid*/)
{
plr->RemoveAura(SPELL_QUARRY);
plr->RemoveAura(SPELL_OIL_REFINERY);
@@ -817,7 +817,7 @@ void BattlegroundIC::HandleCapturedNodes(ICNodePoint* nodePoint, bool recapture)
}
}
void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 destroyedEvent)
void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 /*destroyedEvent*/)
{
GateStatus[GetGateIDFromEntry(go->GetEntry())] = BG_IC_GATE_DESTROYED;
uint32 uws_open = GetWorldStateFromGateEntry(go->GetEntry(), true);
@@ -853,7 +853,7 @@ void BattlegroundIC::DestroyGate(Player* pl, GameObject* go, uint32 destroyedEve
SendMessage2ToAll(lang_entry,CHAT_MSG_BG_SYSTEM_NEUTRAL,NULL,(pl->GetTeamId() == TEAM_ALLIANCE ? LANG_BG_IC_HORDE_KEEP : LANG_BG_IC_ALLIANCE_KEEP));
}
void BattlegroundIC::EventPlayerDamagedGO(Player* /*plr*/, GameObject* go, uint8 hitType, uint32 destroyedEvent)
void BattlegroundIC::EventPlayerDamagedGO(Player* /*plr*/, GameObject* /*go*/, uint8 /*hitType*/, uint32 /*destroyedEvent*/)
{
}
@@ -939,6 +939,6 @@ Transport* BattlegroundIC::CreateTransport(uint32 goEntry,uint32 period)
for (uint8 i = 0; i < 5; i++)
t->AddNPCPassenger(0,(goEntry == GO_HORDE_GUNSHIP ? NPC_HORDE_GUNSHIP_CANNON : NPC_ALLIANCE_GUNSHIP_CANNON), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionX() : allianceGunshipPassengers[i].GetPositionX()) , (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionY() : allianceGunshipPassengers[i].GetPositionY()),(goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetPositionZ() : allianceGunshipPassengers[i].GetPositionZ()), (goEntry == GO_HORDE_GUNSHIP ? hordeGunshipPassengers[i].GetOrientation() : allianceGunshipPassengers[i].GetOrientation()));
return t;
}
src/server/game/Battlegrounds/Zones/BattlegroundIC.h
+2 -2
View File
@@ -617,7 +617,7 @@ const ICGo BG_IC_ObjSpawnlocs[MAX_NORMAL_GAMEOBJECTS_SPAWNS] =
{BG_IC_GO_DOODAD_VR_PORTCULLIS01_1,GO_DOODAD_VR_PORTCULLIS01,1156.89f,-843.998f,48.6322f,0.732934f}, // Doodad_VR_Portcullis01
{BG_IC_GO_DOODAD_VR_PORTCULLIS01_2,GO_DOODAD_VR_PORTCULLIS01,1157.05f,-682.36f,48.6322f,-0.829132f}, // Doodad_VR_Portcullis01
{BG_IC_GO_FLAGPOLE_1_1,GO_FLAGPOLE_1,-400.809f,37.6253f,-1.76278f}, // Flagpole
{BG_IC_GO_FLAGPOLE_1_1,GO_FLAGPOLE_1,-400.809f,37.6253f,-1.76278f, 0.0f}, // Flagpole
{BG_IC_GO_FLAGPOLE_2_1,GO_FLAGPOLE_2,1284.76f,-705.668f,48.9163f,-3.08918f}, // Flagpole
{BG_IC_GO_FLAGPOLE_2_2,GO_FLAGPOLE_2,299.153f,-784.589f,48.9162f,-0.157079f}, // Flagpole
{BG_IC_GO_FLAGPOLE_1_2,GO_FLAGPOLE_1,726.385f,-360.205f,17.8153f,-1.6057f}, // Flagpole
@@ -779,7 +779,7 @@ enum ICNodeState
const uint32 BG_IC_GraveyardIds[MAX_NODE_TYPES+2] = {0, 0, 1480, 1481, 1482, 1485, 1486, 1483, 1484};
const Position TransportMovementInfo = {7.305609f,-0.095246f,34.51022f};
const Position TransportMovementInfo = {7.305609f, -0.095246f, 34.51022f, 0.0f};
const Position TeleportToTransportPosition = {661.0f,-1244.0f,288.0f,0.0f};
const float BG_IC_SpiritGuidePos[MAX_NODE_TYPES+2][4] =
src/server/game/Entities/Player/Player.cpp
+1 -2
View File
@@ -1887,7 +1887,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
if (duel && GetMapId() != mapid && GetMap()->GetGameObject(GetUInt64Value(PLAYER_DUEL_ARBITER)))
DuelComplete(DUEL_FLED);
if (GetMapId() == mapid && !m_transport || (GetTransport() && GetMapId() == 628))
if ((GetMapId() == mapid && !m_transport) || (GetTransport() && GetMapId() == 628))
{
//lets reset far teleport flag if it wasn't reset during chained teleports
SetSemaphoreTeleportFar(false);
@@ -7642,7 +7642,6 @@ void Player::_ApplyItemBonuses(ItemPrototype const *proto, uint8 slot, bool appl
HandleStatModifier(UNIT_MOD_RESISTANCE_ARCANE, BASE_VALUE, float(proto->ArcaneRes), apply);
WeaponAttackType attType = BASE_ATTACK;
float damage = 0.0f;
if (slot == EQUIPMENT_SLOT_RANGED && (
proto->InventoryType == INVTYPE_RANGED || proto->InventoryType == INVTYPE_THROWN ||
src/server/game/Entities/Unit/Unit.cpp
-2
View File
@@ -1648,8 +1648,6 @@ void Unit::CalcAbsorbResist(Unit *pVictim, SpellSchoolMask schoolMask, DamageEff
if (!(absorbAurEff->GetMiscValue() & schoolMask))
continue;
SpellEntry const * spellProto = absorbAurEff->GetSpellProto();
// get amount which can be still absorbed by the aura
int32 currentAbsorb = absorbAurEff->GetAmount();
// aura with infinite absorb amount - let the scripts handle absorbtion amount, set here to 0 for safety
src/server/game/Entities/Vehicle/Vehicle.cpp
+3 -1
View File
@@ -299,10 +299,12 @@ bool Vehicle::AddPassenger(Unit *unit, int8 seatId, bool byAura)
return false;
if (seat->second.passenger)
{
if (Unit* passenger = ObjectAccessor::GetUnit(*GetBase(), seat->second.passenger))
passenger->ExitVehicle();
else
seat->second.passenger = NULL;
}
ASSERT(!seat->second.passenger);
}
@@ -497,4 +499,4 @@ SeatMap::iterator Vehicle::GetSeatIteratorForPassenger(Unit* passenger)
return itr;
return m_Seats.end();
}
}
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -1201,7 +1201,7 @@ void ObjectMgr::LoadLinkedRespawn()
uint32 linkedGuidLow = fields[1].GetUInt32();
uint8 linkType = fields[2].GetUInt8();
uint64 guid, linkedGuid;
uint64 guid = 0, linkedGuid = 0;
bool error = false;
switch (linkType)
{
src/server/game/Server/Protocol/Handlers/MovementHandler.cpp
+2
View File
@@ -703,11 +703,13 @@ void WorldSession::HandleRequestVehicleExit(WorldPacket &recv_data)
if (Vehicle* vehicle = GetPlayer()->GetVehicle())
{
if (VehicleSeatEntry const* seat = vehicle->GetSeatForPassenger(GetPlayer()))
{
if (seat->CanEnterOrExit())
GetPlayer()->ExitVehicle();
else
sLog->outError("Player %u tried to exit vehicle, but seatflags %u (ID: %u) don't permit that.",
GetPlayer()->GetGUIDLow(), seat->m_ID, seat->m_flags);
}
}
}
src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+2 -2
View File
@@ -78,7 +78,7 @@ public:
return true;
}
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 /*uiAction*/)
{
//ScriptedInstance* pInstance = pCreature->GetInstanceData();
@@ -137,7 +137,7 @@ public:
return;
if (((!me->FindNearestCreature(ENTRY_FLAMEWALKER_HEALER,100.0f)) && (!me->FindNearestCreature(ENTRY_FLAMEWALKER_ELITE,100.0f))) && (!m_pInstance->GetData(DATA_MAJORDOMOISDEAD)))
{
{
me->setFaction(35);
me->AI()->EnterEvadeMode();
DoScriptText(SAY_DEFEAT, me);
src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+1 -1
View File
@@ -413,7 +413,7 @@ public:
pInstance->SetData(DATA_RAG_ELE_COUNTER, 1);
}
void UpdateAI(const uint32 diff)
void UpdateAI(const uint32 /*diff*/)
{
if (!UpdateVictim())
return;
src/server/scripts/Examples/example_spell.cpp
+2 -2
View File
@@ -284,14 +284,14 @@ class spell_ex_absorb_aura : public SpellScriptLoader
SPELL_TRIGGERED = 18282
};
void HandleOnEffectAbsorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void HandleOnEffectAbsorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
sLog->outString("Our aura is now absorbing damage done to us!");
// absorb whole damage done to us
absorbAmount = dmgInfo.GetDamage();
}
void HandleAfterEffectAbsorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void HandleAfterEffectAbsorb(AuraEffect * /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
sLog->outString("Our aura has absorbed %u damage!", absorbAmount);
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ class boss_garfrost : public CreatureScript
SetEquipmentSlots(false, EQUIP_ID_MACE);
}
uint32 GetData(uint32 type)
uint32 GetData(uint32 /*type*/)
{
return _permafrostStack;
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+1 -1
View File
@@ -293,7 +293,7 @@ class boss_krick : public CreatureScript
struct boss_krickAI : public ScriptedAI
{
boss_krickAI(Creature* creature) : ScriptedAI(creature), _summons(creature), _instanceScript(creature->GetInstanceScript())
boss_krickAI(Creature* creature) : ScriptedAI(creature), _instanceScript(creature->GetInstanceScript()), _summons(creature)
{
}
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+1 -1
View File
@@ -388,7 +388,7 @@ class player_overlord_brandAI : public PlayerAI
me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID());
}
void UpdateAI(const uint32 diff) { }
void UpdateAI(const uint32 /*diff*/) { }
private:
Creature* tyrannus;
src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp
+6 -6
View File
@@ -115,7 +115,7 @@ public:
uiVaporCount = 0;
}
void EnterCombat(Unit * pWho)
void EnterCombat(Unit * /*pWho*/)
{
_EnterCombat();
@@ -204,12 +204,12 @@ public:
bShadowDodger = false;
}
void KilledUnit(Unit * pWho)
void KilledUnit(Unit * /*pWho*/)
{
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit * pWho)
void JustDied(Unit * /*pWho*/)
{
_JustDied();
@@ -327,7 +327,7 @@ public:
uiProfoundOfDarknessTimer = 3000;
}
void JustDied(Unit * pWho)
void JustDied(Unit * /*pWho*/)
{
if (Creature * pVezax = me->GetCreature(*me, pInstance ? pInstance->GetData64(TYPE_VEZAX) : 0))
pVezax->AI()->DoAction(ACTION_ANIMUS_DIE);
@@ -388,7 +388,7 @@ public:
uiRandomMoveTimer -= uiDiff;
}
void DamageTaken(Unit * pWho, uint32 &uiDamage)
void DamageTaken(Unit * /*pWho*/, uint32 &uiDamage)
{
// This can't be on JustDied. In 63322 dummy handler caster needs to be this NPC
// if caster == target then damage mods will increase the damage taken
@@ -414,4 +414,4 @@ void AddSC_boss_general_vezax()
new boss_general_vezax();
new boss_saronite_animus();
new npc_saronite_vapors();
}
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp
+4 -4
View File
@@ -127,7 +127,7 @@ public:
DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_2), me);
}
void PassengerBoarded(Unit *who, int8 seatId, bool apply)
void PassengerBoarded(Unit *who, int8 /*seatId*/, bool apply)
{
if (who->GetTypeId() == TYPEID_UNIT)
{
@@ -225,7 +225,7 @@ public:
uint32 uiPermittedDamage;
InstanceScript * pInstance;
void EnterCombat(Unit* who)
void EnterCombat(Unit* /*who*/)
{
EncounterInCombat(me, pInstance);
uiStoneGripTimer = 30000;
@@ -239,7 +239,7 @@ public:
DoCast(SPELL_ARM_VISUAL);
}
void DamageTaken(Unit* who, uint32& damage)
void DamageTaken(Unit* /*who*/, uint32& damage)
{
if (uiGrippedTargets[0] == 0)
return;
@@ -331,7 +331,7 @@ public:
uint32 uiSweepTimer;
InstanceScript * pInstance;
void EnterCombat(Unit* who)
void EnterCombat(Unit* /*who*/)
{
EncounterInCombat(me, pInstance);
uiSweepTimer = 15000;
src/server/scripts/Northrend/isle_of_conquest.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ class npc_four_car_garage : public CreatureScript
{
npc_four_car_garageAI(Creature* pCreature) : NullCreatureAI(pCreature) { }
void PassengerBoarded(Unit* who, int8 seatId, bool apply)
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply)
{
if (apply)
{
@@ -70,4 +70,4 @@ class npc_four_car_garage : public CreatureScript
void AddSC_isle_of_conquest()
{
new npc_four_car_garage();
}
}
src/server/scripts/Spells/spell_dk.cpp
+7 -7
View File
@@ -50,7 +50,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// TODO: this should absorb limited amount of damage, but no info on calculation formula
amount = -1;
@@ -102,18 +102,18 @@ public:
return sSpellStore.LookupEntry(DK_SPELL_RUNIC_POWER_ENERGIZE);
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct));
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
// damage absorbed by Anti-Magic Shell energizes the DK with additional runic power.
@@ -164,7 +164,7 @@ public:
return sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT);
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
SpellEntry const * talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT);
amount = SpellMgr::CalculateSpellEffectAmount(talentSpell, EFFECT_0, GetCaster());
@@ -334,7 +334,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -396,7 +396,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
src/server/scripts/Spells/spell_druid.cpp
+4 -4
View File
@@ -101,7 +101,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -145,7 +145,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -189,13 +189,13 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
absorbAmount = uint32(CalculatePctN(GetTarget()->GetTotalAttackPowerValue(BASE_ATTACK), absorbPct));
aurEff->SetAmount(0);
src/server/scripts/Spells/spell_generic.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ public:
return true;
}
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
absorbAmount = std::min(limit, absorbAmount);
}
src/server/scripts/Spells/spell_mage.cpp
+2 -2
View File
@@ -281,7 +281,7 @@ public:
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
@@ -326,7 +326,7 @@ public:
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
src/server/scripts/Spells/spell_paladin.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ public:
return GetUnitOwner()->ToPlayer();
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
src/server/scripts/Spells/spell_priest.cpp
+2 -2
View File
@@ -59,13 +59,13 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit * target = GetTarget();
if (dmgInfo.GetDamage() < target->GetHealth())
src/server/scripts/Spells/spell_rogue.cpp
+3 -3
View File
@@ -58,13 +58,13 @@ public:
return GetUnitOwner()->ToPlayer();
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit * target = GetTarget();
if (dmgInfo.GetDamage() < target->GetHealth())
@@ -118,7 +118,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
src/server/scripts/Spells/spell_shaman.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
src/server/scripts/World/achievement_scripts.cpp
+2 -2
View File
@@ -136,7 +136,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript
public:
achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { }
bool OnCheck(Player* source, Unit* target)
bool OnCheck(Player* source, Unit* /*target*/)
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
{
@@ -153,7 +153,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript
public:
achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { }
bool OnCheck(Player* source, Unit* target)
bool OnCheck(Player* source, Unit* /*target*/)
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
{
src/server/shared/Database/MySQLConnection.cpp
+4 -4
View File
@@ -33,23 +33,23 @@
#include "Log.h"
MySQLConnection::MySQLConnection(MySQLConnectionInfo& connInfo) :
m_statementTable(NULL),
m_reconnecting(false),
m_queue(NULL),
m_worker(NULL),
m_Mysql(NULL),
m_connectionInfo(connInfo),
m_connectionFlags(CONNECTION_SYNCH),
m_statementTable(NULL)
m_connectionFlags(CONNECTION_SYNCH)
{
}
MySQLConnection::MySQLConnection(ACE_Activation_Queue* queue, MySQLConnectionInfo& connInfo) :
m_statementTable(NULL),
m_reconnecting(false),
m_queue(queue),
m_Mysql(NULL),
m_connectionInfo(connInfo),
m_connectionFlags(CONNECTION_ASYNC),
m_statementTable(NULL)
m_connectionFlags(CONNECTION_ASYNC)
{
m_worker = new DatabaseWorker(m_queue, this);
}