summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-26 23:25:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-26 23:25:32 +0300
commit3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0 (patch)
treed7f1400583c5bc6916129e05fc5e0907d1081ca9 /src/resources/db
parent6112e911a5b702fa1a9fca7bb6300f0195cbe685 (diff)
downloadmanaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.gz
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.bz2
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.tar.xz
manaplus-3ed2e647a7ec634a91a32e7ac493c9f2b6d693b0.zip
Fix code style.
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/homunculusdb.cpp8
-rw-r--r--src/resources/db/itemdb.cpp1
-rw-r--r--src/resources/db/mercenarydb.cpp5
-rw-r--r--src/resources/db/monsterdb.cpp1
4 files changed, 6 insertions, 9 deletions
diff --git a/src/resources/db/homunculusdb.cpp b/src/resources/db/homunculusdb.cpp
index 317d0c2df..291fa8262 100644
--- a/src/resources/db/homunculusdb.cpp
+++ b/src/resources/db/homunculusdb.cpp
@@ -26,12 +26,10 @@
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/spritereference.h"
#include "resources/map/blockmask.h"
#include "utils/dtor.h"
-#include "utils/gettext.h"
#include "configuration.h"
@@ -76,7 +74,8 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
{
if (xmlNameEqual(homunculusNode, "include"))
{
- const std::string name = XML::getProperty(homunculusNode, "name", "");
+ const std::string name = XML::getProperty(
+ homunculusNode, "name", "");
if (!name.empty())
loadXmlFile(name);
continue;
@@ -95,7 +94,8 @@ void HomunculusDB::loadXmlFile(const std::string &fileName)
currentInfo = new BeingInfo;
currentInfo->setBlockType(BlockType::MONSTER);
- BeingCommon::readBasicAttributes(currentInfo, homunculusNode, "attack");
+ BeingCommon::readBasicAttributes(currentInfo,
+ homunculusNode, "attack");
currentInfo->setMaxHP(XML::getProperty(homunculusNode, "maxHP", 0));
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index b50fc3944..f4e4116ac 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -35,7 +35,6 @@
#include "resources/db/itemdbstat.h"
-#include "net/net.h"
#include "net/serverfeatures.h"
#include "utils/delete2.h"
diff --git a/src/resources/db/mercenarydb.cpp b/src/resources/db/mercenarydb.cpp
index 432b64006..f1fb26a64 100644
--- a/src/resources/db/mercenarydb.cpp
+++ b/src/resources/db/mercenarydb.cpp
@@ -26,12 +26,10 @@
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/spritereference.h"
#include "resources/map/blockmask.h"
#include "utils/dtor.h"
-#include "utils/gettext.h"
#include "configuration.h"
@@ -76,7 +74,8 @@ void MercenaryDB::loadXmlFile(const std::string &fileName)
{
if (xmlNameEqual(mercenaryNode, "include"))
{
- const std::string name = XML::getProperty(mercenaryNode, "name", "");
+ const std::string name = XML::getProperty(
+ mercenaryNode, "name", "");
if (!name.empty())
loadXmlFile(name);
continue;
diff --git a/src/resources/db/monsterdb.cpp b/src/resources/db/monsterdb.cpp
index 1cbfe66c5..1021804a5 100644
--- a/src/resources/db/monsterdb.cpp
+++ b/src/resources/db/monsterdb.cpp
@@ -26,7 +26,6 @@
#include "resources/beingcommon.h"
#include "resources/beinginfo.h"
-#include "resources/spritereference.h"
#include "resources/map/blockmask.h"