summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-03 21:30:17 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-04 00:03:04 +0300
commite98927f4fe7e45d5494f32797e57b960b7be54b4 (patch)
tree320c8e8a00bcdadef87c22db5ca4b811addc0b57
parent6bb63b931d7a141aa1483a09941fe9f81974faa4 (diff)
downloadmv-e98927f4fe7e45d5494f32797e57b960b7be54b4.tar.gz
mv-e98927f4fe7e45d5494f32797e57b960b7be54b4.tar.bz2
mv-e98927f4fe7e45d5494f32797e57b960b7be54b4.tar.xz
mv-e98927f4fe7e45d5494f32797e57b960b7be54b4.zip
Add basic horses db implimentation.
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/Makefile.am3
-rw-r--r--src/being/being.cpp1
-rw-r--r--src/client.cpp3
-rw-r--r--src/defaults.cpp3
-rw-r--r--src/resources/db/horsedb.cpp157
-rw-r--r--src/resources/db/horsedb.h57
7 files changed, 227 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8dfba8410..df16d5f77 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -613,8 +613,11 @@ SET(SRCS
resources/db/emotedb.h
resources/db/homunculusdb.cpp
resources/db/homunculusdb.h
+ resources/db/horsedb.cpp
+ resources/db/horsedb.h
resources/fboinfo.h
resources/frame.h
+ resources/horseinfo.h
resources/image.cpp
resources/image.h
resources/imagehelper.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index df98c0428..1731da442 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -736,8 +736,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/db/emotedb.h \
resources/db/homunculusdb.cpp \
resources/db/homunculusdb.h \
+ resources/db/horsedb.cpp \
+ resources/db/horsedb.h \
resources/fboinfo.h \
resources/frame.h \
+ resources/horseinfo.h \
resources/image.cpp \
resources/image.h \
resources/imagehelper.cpp \
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 8143f1c90..ed9f03179 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -74,6 +74,7 @@
#include "resources/db/avatardb.h"
#include "resources/db/emotedb.h"
#include "resources/db/homunculusdb.h"
+#include "resources/db/horsedb.h"
#include "resources/db/itemdb.h"
#include "resources/db/mercenarydb.h"
#include "resources/db/monsterdb.h"
diff --git a/src/client.cpp b/src/client.cpp
index ab0b65bcf..1af7d9041 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -104,6 +104,7 @@
#include "resources/db/deaddb.h"
#include "resources/db/emotedb.h"
#include "resources/db/homunculusdb.h"
+#include "resources/db/horsedb.h"
#include "resources/db/sounddb.h"
#include "resources/db/itemdb.h"
#include "resources/db/mapdb.h"
@@ -590,6 +591,7 @@ void Client::gameClear()
ColorDB::unload();
SoundDB::unload();
EmoteDB::unload();
+ HorseDB::unload();
ItemDB::unload();
MercenaryDB::unload();
HomunculusDB::unload();
@@ -1244,6 +1246,7 @@ int Client::gameExec()
WeaponsDB::load();
NPCDB::load();
PETDB::load();
+ HorseDB::load();
EmoteDB::load();
// ModDB::load();
StatusEffect::load();
diff --git a/src/defaults.cpp b/src/defaults.cpp
index f1abdfb60..34af5f039 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -535,6 +535,9 @@ DefaultsData* getPathsDefaults()
AddDEF("hairColorFile", "hair.xml");
AddDEF("hairColorPatchFile", "hair_patch.xml");
AddDEF("hairColorPatchDir", "hair.d");
+ AddDEF("horsesFile", "horses.xml");
+ AddDEF("horsesPatchFile", "horses_patch.xml");
+ AddDEF("horsesPatchDir", "horses.d");
AddDEF("itemColorsFile", "itemcolors.xml");
AddDEF("itemColorsPatchFile", "itemcolors_patch.xml");
AddDEF("itemColorsPatchDir", "itemcolors.d");
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
new file mode 100644
index 000000000..315cd09d0
--- /dev/null
+++ b/src/resources/db/horsedb.cpp
@@ -0,0 +1,157 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "resources/db/horsedb.h"
+
+#include "animatedsprite.h"
+#include "client.h"
+#include "configuration.h"
+#include "logger.h"
+
+#include "resources/beingcommon.h"
+#include "resources/horseinfo.h"
+
+#include "debug.h"
+
+namespace
+{
+ HorseInfos mHorseInfos;
+ HorseInfo mUnknown;
+ bool mLoaded = false;
+}
+
+void HorseDB::load()
+{
+ if (mLoaded)
+ unload();
+
+ mUnknown.sprite = AnimatedSprite::load(
+ paths.getStringValue("spriteErrorFile"));
+ mUnknown.offsetX = 0;
+ mUnknown.offsetY = 0;
+
+ logger->log1("Initializing horse database...");
+
+ loadXmlFile(paths.getStringValue("horsesFile"));
+ loadXmlFile(paths.getStringValue("horsesPatchFile"));
+ loadXmlDir("horsesPatchDir", loadXmlFile);
+
+ mLoaded = true;
+}
+
+void HorseDB::loadXmlFile(const std::string &fileName)
+{
+ XML::Document doc(fileName, true, false);
+ XmlNodePtrConst rootNode = doc.rootNode();
+
+ if (!rootNode || !xmlNameEqual(rootNode, "horses"))
+ {
+ logger->log("Horse Database: Error while loading %s!",
+ fileName.c_str());
+ return;
+ }
+
+ // iterate <emote>s
+ for_each_xml_child_node(horseNode, rootNode)
+ {
+ if (xmlNameEqual(horseNode, "include"))
+ {
+ const std::string name = XML::getProperty(horseNode, "name", "");
+ if (!name.empty())
+ loadXmlFile(name);
+ continue;
+ }
+ else if (!xmlNameEqual(horseNode, "horse"))
+ {
+ continue;
+ }
+
+ const int id = XML::getProperty(horseNode, "id", -1);
+
+ if (id == -1)
+ {
+ logger->log("Horse Database: Horse with missing ID in %s!",
+ paths.getStringValue("horsesFile").c_str());
+ continue;
+ }
+ HorseInfo *currentInfo = nullptr;
+ if (mHorseInfos.find(id) != mHorseInfos.end())
+ currentInfo = mHorseInfos[id];
+ else
+ currentInfo = new HorseInfo;
+
+ currentInfo->offsetX = XML::getProperty(horseNode, "x", 0);
+ currentInfo->offsetY = XML::getProperty(horseNode, "y", 0);
+
+ for_each_xml_child_node(spriteNode, horseNode)
+ {
+ if (!spriteNode->xmlChildrenNode)
+ continue;
+
+ if (xmlNameEqual(spriteNode, "sprite"))
+ {
+ currentInfo->sprite = AnimatedSprite::load(
+ paths.getStringValue("sprites").append(std::string(
+ reinterpret_cast<const char*>(
+ spriteNode->xmlChildrenNode->content))),
+ XML::getProperty(spriteNode, "variant", 0));
+ break;
+ }
+ }
+ mHorseInfos[id] = currentInfo;
+ }
+}
+
+void HorseDB::unload()
+{
+ FOR_EACH (HorseInfos::const_iterator, i, mHorseInfos)
+ {
+ delete i->second->sprite;
+ delete i->second;
+ }
+ mHorseInfos.clear();
+
+ delete mUnknown.sprite;
+
+ mLoaded = false;
+}
+
+const HorseInfo *HorseDB::get(const int id, const bool allowNull)
+{
+ const HorseInfos::const_iterator i = mHorseInfos.find(id);
+
+ if (i == mHorseInfos.end())
+ {
+ if (allowNull)
+ return nullptr;
+ logger->log("HorseDB: Warning, unknown emote ID %d requested", id);
+ return &mUnknown;
+ }
+ else
+ {
+ return i->second;
+ }
+}
+
+int HorseDB::size()
+{
+ return static_cast<signed int>(mHorseInfos.size());
+}
diff --git a/src/resources/db/horsedb.h b/src/resources/db/horsedb.h
new file mode 100644
index 000000000..94809c337
--- /dev/null
+++ b/src/resources/db/horsedb.h
@@ -0,0 +1,57 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RESOURCES_DB_HORSEDB_H
+#define RESOURCES_DB_HORSEDB_H
+
+#include <map>
+#include <string>
+
+#include "localconsts.h"
+
+class AnimatedSprite;
+
+struct HorseInfo;
+
+typedef std::map<int, HorseInfo*> HorseInfos;
+
+/**
+ * Horse information database.
+ */
+namespace HorseDB
+{
+ void load();
+
+ void loadXmlFile(const std::string &fileName);
+
+ void loadSpecialXmlFile(const std::string &fileName);
+
+ void unload();
+
+ const HorseInfo *get(const int id,
+ const bool allowNull = false) A_WARN_UNUSED;
+
+ int size();
+
+ typedef HorseInfos::iterator HorseInfosIterator;
+} // namespace HorseDB
+
+#endif // RESOURCES_DB_HORSEDB_H