summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-02-13 01:54:28 +0300
committerAndrei Karas <akaras@inbox.ru>2018-02-13 04:28:32 +0300
commitacba95ebb0119e7b0f9ef01d9bf3577582857253 (patch)
treeb5346c2a5642456e793b28487020cf1c727d8f07 /src/resources
parent0a47f5c44ddd5fb5157d116ffe0f5ee5f4207eb0 (diff)
downloadplus-acba95ebb0119e7b0f9ef01d9bf3577582857253.tar.gz
plus-acba95ebb0119e7b0f9ef01d9bf3577582857253.tar.bz2
plus-acba95ebb0119e7b0f9ef01d9bf3577582857253.tar.xz
plus-acba95ebb0119e7b0f9ef01d9bf3577582857253.zip
Add clan window.
For now can be opened only by chat command /clan.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/claninfo.h4
-rw-r--r--src/resources/db/clandb.cpp2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/resources/claninfo.h b/src/resources/claninfo.h
index 3e510dcbf..fd96ecf51 100644
--- a/src/resources/claninfo.h
+++ b/src/resources/claninfo.h
@@ -21,6 +21,8 @@
#ifndef RESOURCES_CLANINFO_H
#define RESOURCES_CLANINFO_H
+#include "utils/vector.h"
+
#include <string>
#include "localconsts.h"
@@ -34,7 +36,7 @@ struct ClanInfo final
A_DELETE_COPY(ClanInfo)
- std::string stats;
+ STD_VECTOR<std::string> stats;
int id;
};
diff --git a/src/resources/db/clandb.cpp b/src/resources/db/clandb.cpp
index 977d5439f..e4cf691dd 100644
--- a/src/resources/db/clandb.cpp
+++ b/src/resources/db/clandb.cpp
@@ -97,7 +97,7 @@ void ClanDb::loadXmlFile(const std::string &fileName,
clanInfo->id = id;
- readItemStatsString(clanInfo->stats,
+ readItemStatsVector(clanInfo->stats,
clanNode,
addFields);