Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Warning fixes + compile fix after the merge

Browse Source
This commit is contained in:
Spp
2012-07-30 10:07:26 +02:00
parent b460c496e2
commit 5a99dfad14
7 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Object/Object.cpp
View File

@@ -814,6 +814,8 @@ void Object::GetUpdateFieldData(Player const* target, uint32*& flags, bool& isOw
flags = CorpseUpdateFieldFlags;
isOwner = ToCorpse()->GetOwnerGUID() == target->GetGUID();
break;
case TYPEID_OBJECT:
break;
}
}

3
src/server/game/Spells/Spell.cpp
View File

@@ -2576,6 +2576,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
for (uint32 effectNumber = 0; effectNumber < MAX_SPELL_EFFECTS; ++effectNumber)
{
if (effectMask & (1 << effectNumber))
{
if (unit->IsImmunedToSpellEffect(m_spellInfo, effectNumber))
effectMask &= ~(1 << effectNumber);
else if (m_spellInfo->Effects[effectNumber].IsAura() && !m_spellInfo->IsPositiveEffect(effectNumber))
@@ -2590,7 +2591,9 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA
returnVal = SPELL_MISS_RESIST;
}
}
}
}
if (!effectMask)
return returnVal;

4
src/server/game/Spells/SpellScript.cpp
View File

@@ -247,10 +247,14 @@ bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 eff
return !area;
case TARGET_REFERENCE_TYPE_TARGET: // BOTH
return true;
default:
break;
}
break;
}
break;
default:
break;
}
return false;

1
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
View File

@@ -27,6 +27,7 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "zulaman.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
enum eEnums
{

1
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
View File

@@ -27,6 +27,7 @@ EndScriptData */
#include "ScriptedCreature.h"
#include "zulaman.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
//Trash Waves
float NalorakkWay[8][3] =

2
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
View File

@@ -1336,6 +1336,7 @@ class npc_dark_nucleus : public CreatureScript
{
_targetAuraCheck = 1000;
if (Unit* victim = me->getVictim())
{
if (me->GetDistance(victim) < 15.0f &&
!victim->HasAura(SPELL_SHADOW_RESONANCE_RESIST, me->GetGUID()))
{
@@ -1344,6 +1345,7 @@ class npc_dark_nucleus : public CreatureScript
}
else
MoveInLineOfSight(me->getVictim());
}
}
else
_targetAuraCheck -= diff;

1
src/server/scripts/Spells/spell_holiday.cpp
View File

@@ -25,6 +25,7 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "GridNotifiers.h"
#include "CellImpl.h"
// 45102 Romantic Picnic
enum SpellsPicnic