aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-08-24 18:08:29 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-08-24 18:08:29 +0200
commit4a58341e6db4ffb26356cfd7af90385de94128ff (patch)
treedaa52989e7e37c11f77ec447f28f8314958e74c0
parentb086b2120710b6cffe25d0f1e588898b05768b67 (diff)
Core: Fix warnings
-rw-r--r--contrib/merge_updates_windows.bat1
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat
index 96fafb817ba..c43d4adf907 100644
--- a/contrib/merge_updates_windows.bat
+++ b/contrib/merge_updates_windows.bat
@@ -1,2 +1 @@
copy /a ..\sql\updates\world\*.sql /b world_updates.sql
-copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql \ No newline at end of file
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index 948dc9b7cb3..03051451193 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -227,6 +227,8 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
case TYPEID_GAMEOBJECT:
condMeets &= object->ToGameObject()->GetDBTableGUIDLow() == ConditionValue3;
break;
+ default:
+ break;
}
}
}