diff options
| author | Xanadu <none@none> | 2010-01-21 01:28:18 +0100 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-01-21 01:28:18 +0100 |
| commit | 9e91fc997c5606cb09614aa7ff8fec87ffccd21b (patch) | |
| tree | ce87e56242848a2a2d987397cea3f4536463e76c | |
| parent | da263cd1c49e8383407c9d708c6593aeb0eb9e4d (diff) | |
Fix build.
--HG--
branch : trunk
| -rw-r--r-- | src/game/SpellMgr.cpp | 3 | ||||
| -rw-r--r-- | src/game/World.h | 3 | ||||
| -rw-r--r-- | win/VC90/game.vcproj | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index d21e4a6356b..1a17bc5a301 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -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------------- diff --git a/src/game/World.h b/src/game/World.h index 8acc6fecbb8..7fdd520a2dc 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -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 diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index b9adb49139c..932bad1cd8d 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -1781,14 +1781,6 @@ > </File> <File - RelativePath="..\..\src\game\OutdoorPvPWG.cpp" - > - </File> - <File - RelativePath="..\..\src\game\OutdoorPvPWG.h" - > - </File> - <File RelativePath="..\..\src\game\OutdoorPvPZM.cpp" > </File> |