summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-04 00:40:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-04 00:40:27 +0300
commit8c640abdd1df5b79f1cce709fb0b970b5bcba892 (patch)
treee66b92147b3549a9c55570a16b8751c07a5d0dde /src/resources
parente98927f4fe7e45d5494f32797e57b960b7be54b4 (diff)
downloadplus-8c640abdd1df5b79f1cce709fb0b970b5bcba892.tar.gz
plus-8c640abdd1df5b79f1cce709fb0b970b5bcba892.tar.bz2
plus-8c640abdd1df5b79f1cce709fb0b970b5bcba892.tar.xz
plus-8c640abdd1df5b79f1cce709fb0b970b5bcba892.zip
Draw riding horse if present.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/horsedb.cpp6
-rw-r--r--src/resources/db/horsedb.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 315cd09d0..6da742d3a 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -98,8 +98,8 @@ void HorseDB::loadXmlFile(const std::string &fileName)
else
currentInfo = new HorseInfo;
- currentInfo->offsetX = XML::getProperty(horseNode, "x", 0);
- currentInfo->offsetY = XML::getProperty(horseNode, "y", 0);
+ currentInfo->offsetX = XML::getProperty(horseNode, "offsetX", 0);
+ currentInfo->offsetY = XML::getProperty(horseNode, "offsetY", 0);
for_each_xml_child_node(spriteNode, horseNode)
{
@@ -134,7 +134,7 @@ void HorseDB::unload()
mLoaded = false;
}
-const HorseInfo *HorseDB::get(const int id, const bool allowNull)
+HorseInfo *HorseDB::get(const int id, const bool allowNull)
{
const HorseInfos::const_iterator i = mHorseInfos.find(id);
diff --git a/src/resources/db/horsedb.h b/src/resources/db/horsedb.h
index 94809c337..93134a9b1 100644
--- a/src/resources/db/horsedb.h
+++ b/src/resources/db/horsedb.h
@@ -46,8 +46,8 @@ namespace HorseDB
void unload();
- const HorseInfo *get(const int id,
- const bool allowNull = false) A_WARN_UNUSED;
+ HorseInfo *get(const int id,
+ const bool allowNull = false) A_WARN_UNUSED;
int size();