summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-02-12 03:13:01 +0300
committerAndrei Karas <akaras@inbox.ru>2018-02-12 03:13:01 +0300
commit0e1d656e85e1bbc80e9e8adcfb2c07a8bc0d4bb8 (patch)
tree5b537fe44b0753ced7c6f9fd1aa916604c178f2f /src/resources/db
parent8be2905d29db5013bf8a2d9c5c7c7155af77ed49 (diff)
downloadplus-0e1d656e85e1bbc80e9e8adcfb2c07a8bc0d4bb8.tar.gz
plus-0e1d656e85e1bbc80e9e8adcfb2c07a8bc0d4bb8.tar.bz2
plus-0e1d656e85e1bbc80e9e8adcfb2c07a8bc0d4bb8.tar.xz
plus-0e1d656e85e1bbc80e9e8adcfb2c07a8bc0d4bb8.zip
Fix code style. Add missing actorManager null checks.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/clandb.cpp3
-rw-r--r--src/resources/db/itemdb.cpp4
-rw-r--r--src/resources/db/itemfielddb.h3
3 files changed, 1 insertions, 9 deletions
diff --git a/src/resources/db/clandb.cpp b/src/resources/db/clandb.cpp
index ac32b4ea7..977d5439f 100644
--- a/src/resources/db/clandb.cpp
+++ b/src/resources/db/clandb.cpp
@@ -31,7 +31,6 @@
#include "utils/checkutils.h"
#include "utils/dtor.h"
-#include "utils/gettext.h"
#include "utils/itemxmlutils.h"
#include "debug.h"
@@ -56,7 +55,7 @@ void ClanDb::load()
}
void ClanDb::loadXmlFile(const std::string &fileName,
- const SkipError skipError)
+ const SkipError skipError)
{
XML::Document doc(fileName, UseVirtFs_true, skipError);
XmlNodeConstPtr rootNode = doc.rootNode();
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index fcb0d5651..6410f8f8f 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -36,8 +36,6 @@
#include "resources/db/itemfielddb.h"
-#include "resources/item/itemfieldtype.h"
-
#include "resources/sprite/spritereference.h"
#ifdef TMWA_SUPPORT
@@ -52,8 +50,6 @@
#include "utils/stdmove.h"
#include "utils/stringmap.h"
-#include "utils/translation/podict.h"
-
#include "debug.h"
namespace
diff --git a/src/resources/db/itemfielddb.h b/src/resources/db/itemfielddb.h
index 8d88fef84..3b1ec624a 100644
--- a/src/resources/db/itemfielddb.h
+++ b/src/resources/db/itemfielddb.h
@@ -25,13 +25,10 @@
#include "resources/itemfieldinfos.h"
-#include <map>
#include <string>
#include "localconsts.h"
-struct ItemFieldType;
-
namespace ItemFieldDb
{
void load();