diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-01-08 17:38:44 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-01-08 17:54:56 +0300 |
commit | 2e47d5e2897ffd8bcf85b499fe68a20f9f694ebb (patch) | |
tree | 1b2568135d02822209be1b261ae03a5bb2eee048 | |
parent | 9e7eb26ada6a70d52e80a6392278e2ece0548f33 (diff) | |
download | manaplus-2e47d5e2897ffd8bcf85b499fe68a20f9f694ebb.tar.gz manaplus-2e47d5e2897ffd8bcf85b499fe68a20f9f694ebb.tar.bz2 manaplus-2e47d5e2897ffd8bcf85b499fe68a20f9f694ebb.tar.xz manaplus-2e47d5e2897ffd8bcf85b499fe68a20f9f694ebb.zip |
add moddb support.
-rw-r--r-- | src/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/client.cpp | 3 | ||||
-rw-r--r-- | src/defaults.cpp | 3 | ||||
-rw-r--r-- | src/resources/db/moddb.cpp | 111 | ||||
-rw-r--r-- | src/resources/db/moddb.h | 43 | ||||
-rw-r--r-- | src/resources/modinfo.cpp | 33 | ||||
-rw-r--r-- | src/resources/modinfo.h | 63 |
8 files changed, 264 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65f5a0f44..ba264569b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -474,8 +474,12 @@ SET(SRCS resources/iteminfo.cpp resources/db/mapdb.cpp resources/db/mapdb.h + resources/db/moddb.cpp + resources/db/moddb.h resources/mapreader.cpp resources/mapreader.h + resources/modinfo.cpp + resources/modinfo.h resources/db/monsterdb.cpp resources/db/monsterdb.h resources/db/npcdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c7ee06128..6705fc94d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -611,8 +611,12 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/iteminfo.cpp \ resources/db/mapdb.cpp \ resources/db/mapdb.h \ + resources/db/moddb.cpp \ + resources/db/moddb.h \ resources/mapreader.cpp \ resources/mapreader.h \ + resources/modinfo.cpp \ + resources/modinfo.h \ resources/db/monsterdb.cpp \ resources/db/monsterdb.h \ resources/db/npcdb.cpp \ diff --git a/src/client.cpp b/src/client.cpp index 7c7b1e016..483b70c87 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -98,6 +98,7 @@ #include "resources/db/sounddb.h" #include "resources/db/itemdb.h" #include "resources/db/mapdb.h" +#include "resources/db/moddb.h" #include "resources/db/monsterdb.h" #include "resources/db/npcdb.h" #ifdef MANASERV_SUPPORT @@ -832,6 +833,7 @@ void Client::gameClear() PaletteDB::unload(); PETDB::unload(); StatusEffect::unload(); + ModDB::unload(); if (Net::getLoginHandler()) Net::getLoginHandler()->clearWorlds(); @@ -1454,6 +1456,7 @@ int Client::gameExec() NPCDB::load(); PETDB::load(); EmoteDB::load(); + ModDB::load(); StatusEffect::load(); Units::loadUnits(); diff --git a/src/defaults.cpp b/src/defaults.cpp index 7755ac32b..ebab42d54 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -511,6 +511,9 @@ DefaultsData* getPathsDefaults() AddDEF("avatarsFile", "avatars.xml"); AddDEF("avatarsPatchFile", "avatars_patch.xml"); AddDEF("avatarsPatchDir", "avatars.d"); + AddDEF("modsFile", "mods.xml"); + AddDEF("modsPatchFile", "mods_patch.xml"); + AddDEF("modsPatchDir", "mods.d"); AddDEF("npcsFile", "npcs.xml"); AddDEF("npcsPatchFile", "npcs_patch.xml"); AddDEF("npcsPatchDir", "npcs.d"); diff --git a/src/resources/db/moddb.cpp b/src/resources/db/moddb.cpp new file mode 100644 index 000000000..f66a6dc48 --- /dev/null +++ b/src/resources/db/moddb.cpp @@ -0,0 +1,111 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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/moddb.h" + +#include "configuration.h" +#include "logger.h" + +#include "resources/beingcommon.h" +#include "resources/modinfo.h" + +#include "utils/dtor.h" +#include "utils/gettext.h" + +#include "debug.h" + +namespace +{ + ModInfos mModInfos; + bool mLoaded = false; +} + +void ModDB::load() +{ + if (mLoaded) + unload(); + loadXmlFile(paths.getStringValue("modsFile")); + loadXmlFile(paths.getStringValue("modsPatchFile")); + loadXmlDir("modsPatchDir", loadXmlFile); + mLoaded = true; +} + +void ModDB::loadXmlFile(const std::string &fileName) +{ + XML::Document doc(fileName); + const XmlNodePtr rootNode = doc.rootNode(); + + if (!rootNode || !xmlNameEqual(rootNode, "mods")) + { + logger->log("Mods Database: Error while loading %s!", + fileName.c_str()); + mLoaded = true; + return; + } + + for_each_xml_child_node(modNode, rootNode) + { + if (xmlNameEqual(modNode, "include")) + { + const std::string name = XML::getProperty(modNode, "name", ""); + if (!name.empty()) + loadXmlFile(name); + continue; + } + + if (!xmlNameEqual(modNode, "mod")) + continue; + + const std::string name = XML::langProperty( + // TRANSLATORS: unknown info name + modNode, "name", _("unnamed")); + ModInfo *currentInfo = nullptr; + if (mModInfos.find(name) != mModInfos.end()) + currentInfo = mModInfos[name]; + if (!currentInfo) + currentInfo = new ModInfo; + + currentInfo->setName(name); + currentInfo->setDescription(XML::getProperty( + modNode, "description", "")); + currentInfo->setHelp(XML::getProperty( + modNode, "help", "")); + + mModInfos[name] = currentInfo; + } +} + +void ModDB::unload() +{ + delete_all(mModInfos); + mModInfos.clear(); + mLoaded = false; +} + +ModInfo *ModDB::get(const std::string &name) +{ + ModInfoIterator i = mModInfos.find(name); + if (i == mModInfos.end()) + return nullptr; + else + return i->second; +} diff --git a/src/resources/db/moddb.h b/src/resources/db/moddb.h new file mode 100644 index 000000000..b0944e574 --- /dev/null +++ b/src/resources/db/moddb.h @@ -0,0 +1,43 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 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_MODDB_H +#define RESOURCES_DB_MODDB_H + +#include <string> + +#include "localconsts.h" + +class ModInfo; + +namespace ModDB +{ + void load(); + + void unload(); + + ModInfo *get(const std::string &name) A_WARN_UNUSED; + + void loadXmlFile(const std::string &fileName); +} + +#endif // RESOURCES_DB_MODDB_H diff --git a/src/resources/modinfo.cpp b/src/resources/modinfo.cpp new file mode 100644 index 000000000..61af5b2a1 --- /dev/null +++ b/src/resources/modinfo.cpp @@ -0,0 +1,33 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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/modinfo.h" + +#include "utils/gettext.h" + +#include "debug.h" + +ModInfo::ModInfo() : + // TRANSLATORS: being info default name + mName(_("unnamed")), + mDescription(), + mHelp() +{ +} diff --git a/src/resources/modinfo.h b/src/resources/modinfo.h new file mode 100644 index 000000000..b8e52f027 --- /dev/null +++ b/src/resources/modinfo.h @@ -0,0 +1,63 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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_MODINFO_H +#define RESOURCES_MODINFO_H + +#include <string> +#include <map> + +#include "localconsts.h" + +class ModInfo final +{ + public: + ModInfo(); + + A_DELETE_COPY(ModInfo) + + void setName(const std::string &name) + { mName = name; } + + const std::string &getName() const A_WARN_UNUSED + { return mName; } + + void setDescription(const std::string &text) + { mDescription = text; } + + const std::string &getDescription() const A_WARN_UNUSED + { return mDescription; } + + void setHelp(const std::string &text) + { mHelp = text; } + + const std::string &getHelp() const A_WARN_UNUSED + { return mHelp; } + + private: + std::string mName; + std::string mDescription; + std::string mHelp; +}; + +typedef std::map<std::string, ModInfo*> ModInfos; +typedef ModInfos::iterator ModInfoIterator; + +#endif // RESOURCES_MODINFO_H |