sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed gcc warnings

Browse Source
This commit is contained in:
Yehonal
2017-09-21 00:59:43 +02:00
parent 8ad3c15d63
commit 77340773be
13 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Achievements/AchievementMgr.cpp
+1 -1
View File
@@ -2183,7 +2183,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement)
//! Since no common attributes were found, (not even in titleRewardFlags field) //! Since no common attributes were found, (not even in titleRewardFlags field)
//! we explicitly check by ID. Maybe in the future we could move the achievement_reward //! we explicitly check by ID. Maybe in the future we could move the achievement_reward
//! condition fields to the condition system. //! condition fields to the condition system.
if (uint32 titleId = reward->titleId[achievement->ID == 1793 ? GetPlayer()->getGender() : GetPlayer()->GetTeamId()]) if (uint32 titleId = reward->titleId[achievement->ID == 1793 ? GetPlayer()->getGender() : uint8(GetPlayer()->GetTeamId())])
if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId)) if (CharTitlesEntry const* titleEntry = sCharTitlesStore.LookupEntry(titleId))
GetPlayer()->SetTitle(titleEntry); GetPlayer()->SetTitle(titleEntry);
src/game/Entities/Unit/Unit.cpp
+3 -3
View File
@@ -12077,7 +12077,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT
// ..taken // ..taken
AuraEffectList const& mDamageTaken = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_TAKEN); AuraEffectList const& mDamageTaken = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_TAKEN);
for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i) for (AuraEffectList::const_iterator i = mDamageTaken.begin(); i != mDamageTaken.end(); ++i)
if ((*i)->GetMiscValue() & (spellProto ? spellProto->SchoolMask : attacker->GetMeleeDamageSchoolMask())) if ((*i)->GetMiscValue() & (spellProto ? spellProto->GetSchoolMask() : attacker->GetMeleeDamageSchoolMask()))
TakenFlatBenefit += (*i)->GetAmount(); TakenFlatBenefit += (*i)->GetAmount();
if (attType != RANGED_ATTACK) if (attType != RANGED_ATTACK)
@@ -12088,7 +12088,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT
// Taken total percent damage auras // Taken total percent damage auras
float TakenTotalMod = 1.0f; float TakenTotalMod = 1.0f;
TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, spellProto ? spellProto->SchoolMask : attacker->GetMeleeDamageSchoolMask()); TakenTotalMod *= GetTotalAuraMultiplierByMiscMask(SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, spellProto ? spellProto->GetSchoolMask() : attacker->GetMeleeDamageSchoolMask());
// .. taken pct (special attacks) // .. taken pct (special attacks)
if (spellProto) if (spellProto)
@@ -12172,7 +12172,7 @@ uint32 Unit::MeleeDamageBonusTaken(Unit* attacker, uint32 pdamage, WeaponAttackT
bool addModifier = false; bool addModifier = false;
AuraEffectList const& ResIgnoreAuras = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST); AuraEffectList const& ResIgnoreAuras = attacker->GetAuraEffectsByType(SPELL_AURA_MOD_IGNORE_TARGET_RESIST);
for (AuraEffectList::const_iterator j = ResIgnoreAuras.begin(); j != ResIgnoreAuras.end(); ++j) for (AuraEffectList::const_iterator j = ResIgnoreAuras.begin(); j != ResIgnoreAuras.end(); ++j)
if ((*j)->GetMiscValue() & (spellProto ? spellProto->SchoolMask : SPELL_SCHOOL_MASK_NORMAL)) if ((*j)->GetMiscValue() & (spellProto ? spellProto->GetSchoolMask() : SPELL_SCHOOL_MASK_NORMAL))
{ {
ApplyPct(ignoreModifier, (*j)->GetAmount()); ApplyPct(ignoreModifier, (*j)->GetAmount());
addModifier = true; addModifier = true;
src/game/Entities/Unit/Unit.h
+3 -1
View File
@@ -2411,7 +2411,9 @@ class Unit : public WorldObject
virtual bool HasSpellCooldown(uint32 /*spell_id*/) const { return false; } virtual bool HasSpellCooldown(uint32 /*spell_id*/) const { return false; }
virtual bool HasSpellItemCooldown(uint32 /*spell_id*/, uint32 /*itemid*/) const { return false; } virtual bool HasSpellItemCooldown(uint32 /*spell_id*/, uint32 /*itemid*/) const { return false; }
virtual void AddSpellCooldown(uint32 /*spell_id*/, uint32 /*itemid*/, uint32 /*end_time*/, bool needSendToClient = false, bool forceSendToSpectator = false) { virtual void AddSpellCooldown(uint32 /*spell_id*/, uint32 /*itemid*/, uint32 /*end_time*/, bool needSendToClient = false, bool forceSendToSpectator = false) {
needSendToClient = forceSendToSpectator = false; // workaround for unused parameters // workaround for unused parameters
(void)needSendToClient;
(void)forceSendToSpectator;
} }
bool CanApplyResilience() const { return m_applyResilience; } bool CanApplyResilience() const { return m_applyResilience; }
src/game/Grids/Notifiers/GridNotifiers.h
+1 -6
View File
@@ -1009,12 +1009,7 @@ namespace Trinity
public: public:
AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range) AnyAttackableUnitExceptForOriginalCasterInObjectRangeCheck(WorldObject const* obj, Unit const* funit, float range)
: i_obj(obj), i_funit(funit), i_range(range) : i_obj(obj), i_funit(funit), i_range(range)
{ {}
Unit const* check = i_funit;
Unit const* owner = i_funit->GetOwner();
if (owner)
check = owner;
}
bool operator()(Unit* u) bool operator()(Unit* u)
{ {
if (!u->IsAlive() || u->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE) || (u->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) && !u->IsInCombat())) if (!u->IsAlive() || u->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE) || (u->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC) && !u->IsInCombat()))
src/game/Handlers/MiscHandler.cpp
+1 -1
View File
@@ -1643,7 +1643,7 @@ void WorldSession::HandleSetRaidDifficultyOpcode(WorldPacket & recv_data)
return; return;
} }
if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId()) && mode%2 == _player->GetRaidDifficulty()%2 && group->isRaidGroup()) if (IsSharedDifficultyMap(groupGuy->GetMap()->GetId()) && (_player->GetRaidDifficulty() >= 0 && uint32(mode%2) == uint32(_player->GetRaidDifficulty()%2)) && group->isRaidGroup())
{ {
if (!currMap) if (!currMap)
currMap = groupGuy->GetMap(); currMap = groupGuy->GetMap();
src/scripts/Commands/cs_misc.cpp
+1 -1
View File
@@ -191,7 +191,7 @@ public:
return false; return false;
} }
if (tokens.size() != count+2) if (tokens.size() != uint16(count+2))
{ {
handler->PSendSysMessage("Invalid number of nicknames for this bracket."); handler->PSendSysMessage("Invalid number of nicknames for this bracket.");
handler->SetSentErrorMessage(true); handler->SetSentErrorMessage(true);
src/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+20 -20
View File
@@ -564,37 +564,37 @@ public:
{ {
uint32 essenceId = 0; uint32 essenceId = 0;
uint32 effect2Id = 0; uint32 effect2Id = 0;
uint32 empoweredId = 0; //uint32 empoweredId = 0;
uint32 touchId1 = 0; uint32 touchId1 = 0;
uint32 touchId2 = 0; //uint32 touchId2 = 0;
switch( creature->GetMap()->GetDifficulty() ) switch( creature->GetMap()->GetDifficulty() )
{ {
case 0: case 0:
essenceId = 65684; essenceId = 65684;
empoweredId = 65724; //empoweredId = 65724;
touchId1 = 65950; touchId1 = 65950;
touchId2 = 66001; //touchId2 = 66001;
effect2Id = 65827; effect2Id = 65827;
break; break;
case 1: case 1:
essenceId = 67176; essenceId = 67176;
empoweredId = 67213; //empoweredId = 67213;
touchId1 = 67296; touchId1 = 67296;
touchId2 = 67281; //touchId2 = 67281;
effect2Id = 67179; effect2Id = 67179;
break; break;
case 2: case 2:
essenceId = 67177; essenceId = 67177;
empoweredId = 67214; //empoweredId = 67214;
touchId1 = 67297; touchId1 = 67297;
touchId2 = 67282; //touchId2 = 67282;
effect2Id = 67180; effect2Id = 67180;
break; break;
case 3: case 3:
essenceId = 67178; essenceId = 67178;
empoweredId = 67215; //empoweredId = 67215;
touchId1 = 67298; touchId1 = 67298;
touchId2 = 67283; //touchId2 = 67283;
effect2Id = 67181; effect2Id = 67181;
break; break;
} }
@@ -610,36 +610,36 @@ public:
{ {
uint32 essenceId = 0; uint32 essenceId = 0;
uint32 effect2Id = 0; uint32 effect2Id = 0;
uint32 empoweredId = 0; //uint32 empoweredId = 0;
uint32 touchId1 = 0; //uint32 touchId1 = 0;
uint32 touchId2 = 0; uint32 touchId2 = 0;
switch( creature->GetMap()->GetDifficulty() ) switch( creature->GetMap()->GetDifficulty() )
{ {
case 0: case 0:
essenceId = 65686; essenceId = 65686;
empoweredId = 65748; //empoweredId = 65748;
touchId1 = 65950; //touchId1 = 65950;
touchId2 = 66001; touchId2 = 66001;
effect2Id = 65811; effect2Id = 65811;
break; break;
case 1: case 1:
essenceId = 67222; essenceId = 67222;
empoweredId = 67216; //empoweredId = 67216;
touchId1 = 67296; //touchId1 = 67296;
touchId2 = 67281; touchId2 = 67281;
effect2Id = 67511; effect2Id = 67511;
break; break;
case 2: case 2:
essenceId = 67223; essenceId = 67223;
empoweredId = 67217; //empoweredId = 67217;
touchId1 = 67297; //touchId1 = 67297;
touchId2 = 67282; touchId2 = 67282;
effect2Id = 67512; effect2Id = 67512;
break; break;
case 3: case 3:
essenceId = 67224; essenceId = 67224;
empoweredId = 67218; //empoweredId = 67218;
touchId1 = 67298; //touchId1 = 67298;
touchId2 = 67283; touchId2 = 67283;
effect2Id = 67513; effect2Id = 67513;
break; break;
src/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+9 -7
View File
@@ -653,7 +653,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript
void UpdateAI(uint32 diff) void UpdateAI(uint32 diff)
{ {
_events.Update(diff); _events.Update(diff);
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -894,7 +894,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
void UpdateAI(uint32 diff) void UpdateAI(uint32 diff)
{ {
_events.Update(diff); _events.Update(diff);
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case 0: case 0:
break; break;
@@ -1057,9 +1057,9 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader
Unit* victim = eventInfo.GetActionTarget(); Unit* victim = eventInfo.GetActionTarget();
SpellInfo const* procSpell = eventInfo.GetDamageInfo()->GetSpellInfo(); SpellInfo const* procSpell = eventInfo.GetDamageInfo()->GetSpellInfo();
uint32 markCount = 0; //uint32 markCount = 0;
if (Creature* saurfang = eventInfo.GetActor()->ToCreature()) //if (Creature* saurfang = eventInfo.GetActor()->ToCreature())
markCount = saurfang->IsAIEnabled ? saurfang->AI()->GetData(123456 /*FALLEN_CHAMPION_CAST_COUNT*/) : 0; //markCount = saurfang->IsAIEnabled ? saurfang->AI()->GetData(123456 /*FALLEN_CHAMPION_CAST_COUNT*/) : 0;
int32 basepoints = int32(1.0f /*+ 0.5f + 0.5f*markCount*/); int32 basepoints = int32(1.0f /*+ 0.5f + 0.5f*markCount*/);
switch (procSpell->Id) // some spells give more Blood Power switch (procSpell->Id) // some spells give more Blood Power
{ {
@@ -1106,13 +1106,15 @@ class spell_deathbringer_blood_link_blood_beast_aura : public SpellScriptLoader
{ {
PreventDefaultAction(); PreventDefaultAction();
/*
uint32 markCount = 0; uint32 markCount = 0;
if (Map* map = eventInfo.GetActor()->FindMap()) if (Map* map = eventInfo.GetActor()->FindMap())
if (InstanceMap* imap = map->ToInstanceMap()) if (InstanceMap* imap = map->ToInstanceMap())
if (InstanceScript* isc = imap->GetInstanceScript()) if (InstanceScript* isc = imap->GetInstanceScript())
if (uint64 sguid = isc->GetData64(3 /*DATA_DEATHBRINGER_SAURFANG*/)) if (uint64 sguid = isc->GetData64(3) //DATA_DEATHBRINGER_SAURFANG
if (Creature* saurfang = ObjectAccessor::GetCreature(*eventInfo.GetActor(), sguid)) if (Creature* saurfang = ObjectAccessor::GetCreature(*eventInfo.GetActor(), sguid))
markCount = saurfang->IsAIEnabled ? saurfang->AI()->GetData(123456 /*FALLEN_CHAMPION_CAST_COUNT*/) : 0; markCount = saurfang->IsAIEnabled ? saurfang->AI()->GetData(123456) : 0; //FALLEN_CHAMPION_CAST_COUNT
*/
int32 basepoints = int32(3.0f /*+ 0.5f + 0.5f*markCount*/); int32 basepoints = int32(3.0f /*+ 0.5f + 0.5f*markCount*/);
eventInfo.GetActor()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, basepoints, eventInfo.GetActionTarget(), true); eventInfo.GetActor()->CastCustomSpell(SPELL_BLOOD_LINK_DUMMY, SPELLVALUE_BASE_POINT0, basepoints, eventInfo.GetActionTarget(), true);
src/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+9 -9
View File
@@ -956,7 +956,7 @@ class boss_the_lich_king : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING) && !((1 << _phase) & PHASE_MASK_NO_CAST_CHECK)) if (me->HasUnitState(UNIT_STATE_CASTING) && !((1 << _phase) & PHASE_MASK_NO_CAST_CHECK))
return; return;
switch (uint32 eventId = events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_BERSERK: case EVENT_BERSERK:
Talk(SAY_LK_BERSERK); Talk(SAY_LK_BERSERK);
@@ -1342,7 +1342,7 @@ class npc_tirion_fordring_tft : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_INTRO_LK_MOVE: case EVENT_INTRO_LK_MOVE:
if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING))) if (Creature* theLichKing = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_THE_LICH_KING)))
@@ -1799,7 +1799,7 @@ class npc_shambling_horror_icc : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_SHOCKWAVE: case EVENT_SHOCKWAVE:
me->CastSpell(me->GetVictim(), SPELL_SHOCKWAVE, false); me->CastSpell(me->GetVictim(), SPELL_SHOCKWAVE, false);
@@ -2329,7 +2329,7 @@ class npc_raging_spirit : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING)) if (me->HasUnitState(UNIT_STATE_CASTING))
return; return;
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_RAGING_SPIRIT_UNROOT: case EVENT_RAGING_SPIRIT_UNROOT:
{ {
@@ -2581,10 +2581,10 @@ class npc_valkyr_shadowguard : public CreatureScript
} }
dropped = true; dropped = true;
_events.Reset(); _events.Reset();
Player* p = NULL; /*Player* p = NULL;
if (Vehicle* v = me->GetVehicleKit()) if (Vehicle* v = me->GetVehicleKit())
if (Unit* passenger = v->GetPassenger(0)) if (Unit* passenger = v->GetPassenger(0))
p = passenger->ToPlayer(); p = passenger->ToPlayer();*/
me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false); me->CastSpell((Unit*)NULL, SPELL_EJECT_ALL_PASSENGERS, false);
if (IsHeroic()) if (IsHeroic())
@@ -2619,7 +2619,7 @@ class npc_valkyr_shadowguard : public CreatureScript
if (me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED)) if (me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED))
return; return;
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_GRAB_PLAYER: case EVENT_GRAB_PLAYER:
if (!_grabbedPlayer) if (!_grabbedPlayer)
@@ -3154,7 +3154,7 @@ class npc_strangulate_vehicle : public CreatureScript
{ {
_events.Update(diff); _events.Update(diff);
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_TELEPORT: case EVENT_TELEPORT:
me->GetMotionMaster()->Clear(false); me->GetMotionMaster()->Clear(false);
@@ -3281,7 +3281,7 @@ class npc_terenas_menethil : public CreatureScript
_events.Update(diff); _events.Update(diff);
switch (uint32 eventId = _events.ExecuteEvent()) switch (_events.ExecuteEvent())
{ {
case EVENT_FROSTMOURNE_TALK_1: case EVENT_FROSTMOURNE_TALK_1:
me->SetControlled(false, UNIT_STATE_ROOT); me->SetControlled(false, UNIT_STATE_ROOT);
src/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+1 -1
View File
@@ -132,7 +132,7 @@ enum ThorimSpells
#define SPELL_RUNIC_SHIELD RAID_MODE(SPELL_RUNIC_SHIELD_10, SPELL_RUNIC_SHIELD_25) #define SPELL_RUNIC_SHIELD RAID_MODE(SPELL_RUNIC_SHIELD_10, SPELL_RUNIC_SHIELD_25)
#define SPELL_CHAIN_LIGHTNING RAID_MODE(SPELL_CHAIN_LIGHTNING_10, SPELL_CHAIN_LIGHTNING_25) #define SPELL_CHAIN_LIGHTNING RAID_MODE(SPELL_CHAIN_LIGHTNING_10, SPELL_CHAIN_LIGHTNING_25)
enum ThormNPCandGOs enum ThormNPCandGOs : uint32
{ {
// ARENA INIT // ARENA INIT
NPC_DARK_RUNE_ACOLYTE_I = 32886, NPC_DARK_RUNE_ACOLYTE_I = 32886,
src/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp
+2 -2
View File
@@ -537,9 +537,9 @@ public:
summons.DoAction(_currentIllusion, pred); summons.DoAction(_currentIllusion, pred);
if (_isIllusionReversed) if (_isIllusionReversed)
_currentIllusion = _currentIllusion == 3 ? 1 : ++_currentIllusion; _currentIllusion = _currentIllusion == 3 ? 1 : (_currentIllusion+1);
else else
_currentIllusion = _currentIllusion == 1 ? 3 : --_currentIllusion; _currentIllusion = _currentIllusion == 1 ? 3 : (_currentIllusion-1);
} }
void SpellSounds() void SpellSounds()
src/scripts/Northrend/VioletHold/violet_hold.cpp
+1 -1
View File
@@ -283,7 +283,7 @@ struct violet_hold_trashAI : public npc_escortAI
void WaypointReached(uint32 id) void WaypointReached(uint32 id)
{ {
if (PLoc<6) if (PLoc<6)
if (id == PLocWPCount[PLoc] -1 -(bAlt ? 1 : 0)) if (id == uint16(PLocWPCount[PLoc] -1 -(bAlt ? 1 : 0)))
CreatureStartAttackDoor(); CreatureStartAttackDoor();
} }
src/worldserver/CommandLine/CliRunnable.cpp
+1
View File
@@ -41,6 +41,7 @@ char* command_finder(const char* text, int state)
while (idx < cmd.size()) while (idx < cmd.size())
{ {
ret = cmd[idx].Name;
if (!cmd[idx].AllowConsole) if (!cmd[idx].AllowConsole)
{ {
++idx; ++idx;