Fix a lot of warnings

2 files changed, 6 insertions, 6 deletions

diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index d38cc2a38ee..320a02a30ed 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -40,7 +40,6 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
         return false;
     }
     bool condMeets = false;
-    bool sendErrorMsg = false;
     switch (ConditionType)
     {
         case CONDITION_NONE:
@@ -724,7 +723,7 @@ bool ConditionMgr::addToGossipMenus(Condition* cond)
     {
         for (GossipMenusContainer::iterator itr = pMenuBounds.first; itr != pMenuBounds.second; ++itr)
         {
-            if ((*itr).second.entry == cond->SourceGroup && (*itr).second.text_id == cond->SourceEntry)
+            if ((*itr).second.entry == cond->SourceGroup && (*itr).second.text_id == uint32(cond->SourceEntry))
             {
                 (*itr).second.conditions.push_back(cond);
                 return true;
@@ -743,7 +742,7 @@ bool ConditionMgr::addToGossipMenuItems(Condition* cond)
     {
         for (GossipMenuItemsContainer::iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr)
         {
-            if ((*itr).second.MenuId == cond->SourceGroup && (*itr).second.OptionIndex == cond->SourceEntry)
+            if ((*itr).second.MenuId == cond->SourceGroup && (*itr).second.OptionIndex == uint32(cond->SourceEntry))
             {
                 (*itr).second.Conditions.push_back(cond);
                 return true;
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
index 3c968998566..79a2122ae29 100755
--- a/src/server/game/Conditions/ConditionMgr.h
+++ b/src/server/game/Conditions/ConditionMgr.h
@@ -255,10 +255,11 @@ template <class T> bool CompareValues(ComparisionType type,  T val1, T val2)
             return val1 >= val2;
         case COMP_TYPE_LOW_EQ:
             return val1 <= val2;
+        default:
+            // incorrect parameter
+            ASSERT(false);
+            return false;
     }
-    // incorrect parameter
-    ASSERT(false);
-    return false;
 }
 
 #define sConditionMgr ACE_Singleton<ConditionMgr, ACE_Null_Mutex>::instance()