aboutsummaryrefslogtreecommitdiff
path: root/src/game/ObjectMgr.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-03 22:21:46 -0500
committermegamage <none@none>2009-05-03 22:21:46 -0500
commit1cfc04f1f59b0a3d8c75b901554cd05ec90158ce (patch)
tree3e74e030fd9c21b94d9e60c16629b0264b36d9d2 /src/game/ObjectMgr.cpp
parent5f167c56ef03ae7dfe69f3bd927612bf3cfa4991 (diff)
[7745] Fixed gcc warnings. Author: AlexDereka
--HG-- branch : trunk
Diffstat (limited to 'src/game/ObjectMgr.cpp')
-rw-r--r--src/game/ObjectMgr.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 18242265fcb..4ed4c282e33 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -5048,8 +5048,10 @@ WorldSafeLocsEntry const *ObjectMgr::GetClosestGraveYard(float x, float y, float
if(MapId != entry->map_id)
{
// if find graveyard at different map from where entrance placed (or no entrance data), use any first
- if (!mapEntry || mapEntry->entrance_map < 0 || mapEntry->entrance_map != entry->map_id ||
- mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0)
+ if (!mapEntry ||
+ mapEntry->entrance_map < 0 ||
+ mapEntry->entrance_map != entry->map_id ||
+ (mapEntry->entrance_x == 0 && mapEntry->entrance_y == 0))
{
// not have any corrdinates for check distance anyway
entryFar = entry;
@@ -7170,6 +7172,8 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
case CONDITION_INSTANCE_DATA:
//TODO: need some check
break;
+ case CONDITION_NONE:
+ break;
}
return true;
}