From 546d5180247512270a2ccd114266fb36cd426e61 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 13 May 2016 22:03:58 +0300
Subject: Add check asserts in ItemDB. Also fix new asserts from log.

---
 src/itemcolormanager.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/itemcolormanager.cpp')

diff --git a/src/itemcolormanager.cpp b/src/itemcolormanager.cpp
index 9344ff856..0cf48015b 100644
--- a/src/itemcolormanager.cpp
+++ b/src/itemcolormanager.cpp
@@ -32,9 +32,18 @@ ItemColor ItemColorManager::getColorFromCards(const int *const cards)
 {
     if (!cards)
         return ItemColor_one;
+    if (cards[0] == CARD0_FORGE ||
+        cards[0] == CARD0_CREATE ||
+        cards[0] == CARD0_PET)
+    {
+        return ItemColor_one;
+    }
     for (int f = 0; f < maxCards; f ++)
     {
-        const ItemInfo &info = ItemDB::get(cards[f]);
+        const int id = cards[f];
+        if (id == 0)
+            continue;
+        const ItemInfo &info = ItemDB::get(id);
         const ItemColor &color = info.getCardColor();
         if (color != ItemColor_zero)
             return color;
-- 
cgit v1.2.3-60-g2f50