Fix some warnings here and there

2011-07-27 11:00:39 +02:00
parent 39be30a39f
commit fa50c0a464
8 changed files with 50 additions and 48 deletions
@@ -11418,7 +11418,7 @@ InventoryResult Player::CanEquipItem(uint8 slot, uint16 &dest, Item *pItem, bool
                return EQUIP_ERR_NO_EQUIPMENT_SLOT_AVAILABLE;

            // if swap ignore item (equipped also)
-            InventoryResult res2 = CanEquipUniqueItem(pItem, swap ? eslot : NULL_SLOT);
+            InventoryResult res2 = CanEquipUniqueItem(pItem, swap ? eslot : uint8(NULL_SLOT));
            if (res2 != EQUIP_ERR_OK)
                return res2;

@@ -14292,6 +14292,8 @@ uint32 Player::GetDefaultGossipMenuForSource(WorldObject* source)
            return source->ToCreature()->GetCreatureInfo()->GossipMenuId;
        case TYPEID_GAMEOBJECT:
            return source->ToGameObject()->GetGOInfo()->GetGossipMenuId();
+        default:
+            break;
    }

    return 0;