Fix build.

--HG--
branch : trunk
This commit is contained in:
Xanadu
2010-01-21 01:28:18 +01:00
parent da263cd1c4
commit 9e91fc997c
3 changed files with 5 additions and 9 deletions

View File

@@ -2993,6 +2993,7 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
if (auraSpell) // not have expected aura
if (!player || auraSpell > 0 && !player->HasAura(auraSpell) || auraSpell < 0 && player->HasAura(-auraSpell))
return false;
// Extra conditions -- leaving the possibility add extra conditions...
switch(spellId)
{
@@ -3001,6 +3002,8 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
return false;
break;
}
return true;
}
//-----------TRINITY-------------

View File

@@ -89,7 +89,8 @@ enum WorldTimers
// States than may change after server started
enum WorldStates
{
WORLDSTATE_VALUE_COUNT,
WORLDSTATE_WINTERGRASP_CONTROLING_FACTION,
WORLDSTATE_VALUE_COUNT
};
/// Configuration elements

View File

@@ -1780,14 +1780,6 @@
RelativePath="..\..\src\game\OutdoorPvPTF.h"
>
</File>
<File
RelativePath="..\..\src\game\OutdoorPvPWG.cpp"
>
</File>
<File
RelativePath="..\..\src\game\OutdoorPvPWG.h"
>
</File>
<File
RelativePath="..\..\src\game\OutdoorPvPZM.cpp"
>