summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-23 20:53:16 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-23 20:53:16 +0300
commit3fb968387deba0cbfd59d029aa6cf4789d68d09c (patch)
tree46eb904ec8efd5a0e7e9c69c005a383a51e50f85 /src/resources
parent2b81fecc1c7c239e4b35312f46952e9b16029b67 (diff)
downloadmanaplus-3fb968387deba0cbfd59d029aa6cf4789d68d09c.tar.gz
manaplus-3fb968387deba0cbfd59d029aa6cf4789d68d09c.tar.bz2
manaplus-3fb968387deba0cbfd59d029aa6cf4789d68d09c.tar.xz
manaplus-3fb968387deba0cbfd59d029aa6cf4789d68d09c.zip
Dont show asserts in pickup special packets.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp5
-rw-r--r--src/resources/db/itemdb.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 6c79c12e8..3438c59ad 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -780,6 +780,11 @@ const ItemDB::ItemInfos &ItemDB::getItemInfos()
return mItemInfos;
}
+const ItemInfo &ItemDB::getEmpty()
+{
+ return *mUnknown;
+}
+
static int parseSpriteName(const std::string &name)
{
int id = -1;
diff --git a/src/resources/db/itemdb.h b/src/resources/db/itemdb.h
index d8706ef31..b0aceef32 100644
--- a/src/resources/db/itemdb.h
+++ b/src/resources/db/itemdb.h
@@ -58,6 +58,8 @@ namespace ItemDB
const ItemInfo &get(const int id) A_WARN_UNUSED;
const ItemInfo &get(const std::string &name) A_WARN_UNUSED;
+ const ItemInfo &getEmpty() A_WARN_UNUSED;
+
int getNumOfHairstyles() A_WARN_UNUSED;
// Items database