summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-07-21 00:47:44 +0300
committerAndrei Karas <akaras@inbox.ru>2015-07-21 00:47:44 +0300
commitfffbd86a1014ad169ed2d68ea58cdddf346faa14 (patch)
tree713c96fcf7421ca87f638d312e752179281cb8fe /src/resources/db
parent1941b81a5a278f26a5d7e1f91903ab04c92e2cd1 (diff)
downloadplus-fffbd86a1014ad169ed2d68ea58cdddf346faa14.tar.gz
plus-fffbd86a1014ad169ed2d68ea58cdddf346faa14.tar.bz2
plus-fffbd86a1014ad169ed2d68ea58cdddf346faa14.tar.xz
plus-fffbd86a1014ad169ed2d68ea58cdddf346faa14.zip
Add missing checks and non null attributes.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/emotedb.cpp2
-rw-r--r--src/resources/db/horsedb.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index accea5ae9..eb5eef418 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -108,6 +108,8 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
currentInfo = mEmoteInfos[id];
else
currentInfo = new EmoteInfo;
+ if (!currentInfo)
+ continue;
currentInfo->time = XML::getProperty(emoteNode, "time", 500);
currentInfo->effectId = XML::getProperty(emoteNode, "effect", -1);
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 11fd57d36..a3daf76cc 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -97,6 +97,8 @@ void HorseDB::loadXmlFile(const std::string &fileName)
else
currentInfo = new HorseInfo;
+ if (!currentInfo)
+ continue;
currentInfo->offsetX = XML::getProperty(horseNode, "offsetX", 0);
currentInfo->offsetY = XML::getProperty(horseNode, "offsetY", 0);