diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-07-12 19:17:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-07-12 21:12:24 +0300 |
commit | acedb80af76334b0e0acd877d3de0ab8ab46a576 (patch) | |
tree | 396689c62dd76f681948799c0a319bf8e12498f0 | |
parent | 64d81679e4fbaba26cd538669a394070e9aa7c44 (diff) | |
download | mv-acedb80af76334b0e0acd877d3de0ab8ab46a576.tar.gz mv-acedb80af76334b0e0acd877d3de0ab8ab46a576.tar.bz2 mv-acedb80af76334b0e0acd877d3de0ab8ab46a576.tar.xz mv-acedb80af76334b0e0acd877d3de0ab8ab46a576.zip |
Add loading groupdb.
For now unused.
-rw-r--r-- | src/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/defaults.cpp | 3 | ||||
-rw-r--r-- | src/resources/db/groupdb.cpp | 129 | ||||
-rw-r--r-- | src/resources/db/groupdb.h | 47 | ||||
-rw-r--r-- | src/resources/dbmanager.cpp | 3 | ||||
-rw-r--r-- | src/resources/groupinfo.h | 41 |
7 files changed, 229 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ca8b0dbd..e363bcbdd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -661,12 +661,15 @@ SET(SRCS resources/equipmentslots.h resources/db/emotedb.cpp resources/db/emotedb.h + resources/db/groupdb.cpp + resources/db/groupdb.h resources/db/homunculusdb.cpp resources/db/homunculusdb.h resources/db/horsedb.cpp resources/db/horsedb.h resources/fboinfo.h resources/frame.h + resources/groupinfo.h resources/horseinfo.h resources/horseoffset.h resources/image/image.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 14e4b875c..9f5094e34 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -440,6 +440,7 @@ BASE_SRC += events/actionevent.h \ resources/dye/dyepaletteptr.h \ resources/fboinfo.h \ resources/frame.h \ + resources/groupinfo.h \ resources/image/image.cpp \ resources/image/image.h \ resources/imagehelper.cpp \ @@ -1374,6 +1375,8 @@ SRC = ${BASE_SRC} \ resources/db/elementaldb.h \ resources/db/emotedb.cpp \ resources/db/emotedb.h \ + resources/db/groupdb.cpp \ + resources/db/groupdb.h \ resources/db/homunculusdb.cpp \ resources/db/homunculusdb.h \ resources/db/horsedb.cpp \ diff --git a/src/defaults.cpp b/src/defaults.cpp index a7c1365a9..e5b1a1036 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -659,6 +659,9 @@ DefaultsData* getPathsDefaults() AddDEF("statFile", "stats.xml"); AddDEF("statPatchFile", "stats_patch.xml"); AddDEF("statPatchDir", "stats.d"); + AddDEF("groupsFile", "groups.xml"); + AddDEF("groupsPatchFile", "groups_patch.xml"); + AddDEF("groupsPatchDir", "groups.d"); AddDEF("equipmentSlotsFile", "equipmentslots.xml"); AddDEF("weaponsFile", "weapons.xml"); AddDEF("poisonEffectName", "poison"); diff --git a/src/resources/db/groupdb.cpp b/src/resources/db/groupdb.cpp new file mode 100644 index 000000000..ab9a2958d --- /dev/null +++ b/src/resources/db/groupdb.cpp @@ -0,0 +1,129 @@ +/* + * The ManaPlus Client + * Copyright (C) 2016-2017 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/groupdb.h" + +#include "configuration.h" + +#include "utils/checkutils.h" + +#include "resources/beingcommon.h" +#include "resources/groupinfo.h" + +#include "debug.h" + +namespace +{ + GroupDb::GroupInfos mGroups; + const GroupInfo mEmptyGroup; + bool mLoaded = false; +} // namespace + +void GroupDb::load() +{ + if (mLoaded) + unload(); + + loadXmlFile(paths.getStringValue("groupsFile"), SkipError_false); + loadXmlFile(paths.getStringValue("groupsPatchFile"), SkipError_true); + loadXmlDir("groupsPatchDir", loadXmlFile); + mLoaded = true; +} + +void GroupDb::loadXmlFile(const std::string &fileName, + const SkipError skipError) +{ + XML::Document doc(fileName, + UseVirtFs_true, + skipError); + XmlNodeConstPtrConst rootNode = doc.rootNode(); + + if (rootNode == nullptr || + !xmlNameEqual(rootNode, "groups")) + { + if (skipError == SkipError_true) + { + logger->log("GroupsDb: Error while loading %s!", + fileName.c_str()); + } + else + { + reportAlways("GroupsDb: Error while loading %s!", + fileName.c_str()); + } + return; + } + + for_each_xml_child_node(node, rootNode) + { + if (xmlNameEqual(node, "include")) + { + const std::string name = XML::getProperty(node, "name", ""); + if (!name.empty()) + loadXmlFile(name, skipError); + continue; + } + if (xmlNameEqual(node, "group")) + { + const int id = XML::getProperty(node, + "id", + -1); + if (id < 0) + { + reportAlways("Empty id field in GroupDb"); + continue; + } + mGroups[id].name = XML::langProperty(node, + "name", + ""); + mGroups[id].longName = XML::langProperty(node, + "longName", + ""); + } + } +} + +void GroupDb::unload() +{ + mGroups.clear(); + mLoaded = false; +} + +const std::string &GroupDb::getName(const int id) +{ + GroupInfos::const_iterator it = mGroups.find(id); + if (it == mGroups.end()) + { + reportAlways("Unknown group id requested: %d", id); + return mEmptyGroup.name; + } + return (*it).second.name; +} + +const std::string &GroupDb::getLongName(const int id) +{ + GroupInfos::const_iterator it = mGroups.find(id); + if (it == mGroups.end()) + { + reportAlways("Unknown group id requested: %d", id); + return mEmptyGroup.longName; + } + return (*it).second.longName; +} diff --git a/src/resources/db/groupdb.h b/src/resources/db/groupdb.h new file mode 100644 index 000000000..de055c97f --- /dev/null +++ b/src/resources/db/groupdb.h @@ -0,0 +1,47 @@ +/* + * The ManaPlus Client + * Copyright (C) 2016-2017 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_GROUPDB_H +#define RESOURCES_DB_GROUPDB_H + +#include "enums/simpletypes/skiperror.h" + +#include <map> +#include <string> + +#include "localconsts.h" + +struct GroupInfo; + +namespace GroupDb +{ + void load(); + + void unload(); + + void loadXmlFile(const std::string &fileName, + const SkipError skipError); + const std::string &getName(const int id); + const std::string &getLongName(const int id); + + typedef std::map<int, GroupInfo> GroupInfos; +} // namespace ItemOptionDb + +#endif // RESOURCES_DB_GROUPDB_H diff --git a/src/resources/dbmanager.cpp b/src/resources/dbmanager.cpp index 47a9deeee..43bef80ca 100644 --- a/src/resources/dbmanager.cpp +++ b/src/resources/dbmanager.cpp @@ -32,6 +32,7 @@ #include "resources/db/deaddb.h" #include "resources/db/elementaldb.h" #include "resources/db/emotedb.h" +#include "resources/db/groupdb.h" #include "resources/db/homunculusdb.h" #include "resources/db/horsedb.h" #include "resources/db/itemdb.h" @@ -60,6 +61,7 @@ void DbManager::loadDb() { CharDB::load(); + GroupDb::load(); StatDb::load(); DeadDB::load(); PaletteDB::load(); @@ -101,6 +103,7 @@ void DbManager::loadDb() void DbManager::unloadDb() { CharDB::unload(); + GroupDb::unload(); StatDb::unload(); DeadDB::unload(); ColorDB::unload(); diff --git a/src/resources/groupinfo.h b/src/resources/groupinfo.h new file mode 100644 index 000000000..215f98873 --- /dev/null +++ b/src/resources/groupinfo.h @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2017 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_GROUPINFO_H +#define RESOURCES_GROUPINFO_H + +#include "localconsts.h" + +#include <string> + +struct GroupInfo final +{ + GroupInfo() : + name(), + longName() + { } + + A_DELETE_COPY(GroupInfo) + + std::string name; + std::string longName; +}; + +#endif // RESOURCES_GROUPINFO_H |