summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-07 00:05:36 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-07 00:05:36 +0300
commita0f7d665da88809186f535401fb5de85286f7af3 (patch)
treee2ff024edb813e974ca70dad70049a6d06e29528
parenteb49768b0908dcd90f26a6bb381e864d0cd5e550 (diff)
downloadplus-a0f7d665da88809186f535401fb5de85286f7af3.tar.gz
plus-a0f7d665da88809186f535401fb5de85286f7af3.tar.bz2
plus-a0f7d665da88809186f535401fb5de85286f7af3.tar.xz
plus-a0f7d665da88809186f535401fb5de85286f7af3.zip
fix code style.
-rw-r--r--src/gui/windows/npcdialog.cpp3
-rw-r--r--src/input/inputactionmap.h3
-rw-r--r--src/inventory.h1
-rw-r--r--src/net/eathena/npcrecv.cpp1
-rw-r--r--src/resources/db/npcdialogdb.cpp1
-rw-r--r--src/resources/db/npcdialogdb.h4
-rw-r--r--src/resources/npcdialoginfo.h5
-rw-r--r--src/shopitem.cpp1
8 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 539662f51..f2157585d 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -54,6 +54,7 @@
#include "gui/widgets/playerbox.h"
#include "gui/widgets/scrollarea.h"
+#include "resources/npcdialoginfo.h"
#include "resources/resourcemanager.h"
#include "resources/db/avatardb.h"
@@ -557,7 +558,7 @@ void NpcDialog::action(const ActionEvent &event)
const std::string cmd = eventId.substr(5);
std::string printText;
int cnt = 0;
- FOR_EACH(StringVectCIter, it, mItems)
+ FOR_EACH (StringVectCIter, it, mItems)
{
if (cmd == *it)
{
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index f3e75ed40..5d6fdc702 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -263,7 +263,8 @@ static const InputActionData inputActionData
Input::GRP_DEFAULT,
&Actions::sit,
InputAction::NO_VALUE, 50,
- InputCondition::GAME | InputCondition::NOTARGET | InputCondition::NOBLOCK,
+ InputCondition::GAME | InputCondition::NOTARGET |
+ InputCondition::NOBLOCK,
"sit",
UseArgs_false,
Protected_false},
diff --git a/src/inventory.h b/src/inventory.h
index 311e6c5f0..c14d22bf8 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -38,7 +38,6 @@
#include "utils/intmap.h"
#include <list>
-#include <string>
#include "localconsts.h"
diff --git a/src/net/eathena/npcrecv.cpp b/src/net/eathena/npcrecv.cpp
index 2c0fa6d2f..2415f9b3c 100644
--- a/src/net/eathena/npcrecv.cpp
+++ b/src/net/eathena/npcrecv.cpp
@@ -21,7 +21,6 @@
#include "net/eathena/npcrecv.h"
#include "actormanager.h"
-#include "logger.h"
#include "being/being.h"
diff --git a/src/resources/db/npcdialogdb.cpp b/src/resources/db/npcdialogdb.cpp
index 365ed018e..4c25b9744 100644
--- a/src/resources/db/npcdialogdb.cpp
+++ b/src/resources/db/npcdialogdb.cpp
@@ -24,6 +24,7 @@
#include "logger.h"
#include "resources/beingcommon.h"
+#include "resources/npcdialoginfo.h"
#include "utils/dtor.h"
diff --git a/src/resources/db/npcdialogdb.h b/src/resources/db/npcdialogdb.h
index d77826ab3..98ef2360c 100644
--- a/src/resources/db/npcdialogdb.h
+++ b/src/resources/db/npcdialogdb.h
@@ -21,14 +21,14 @@
#ifndef RESOURCES_DB_NPCDIALOGDB_H
#define RESOURCES_DB_NPCDIALOGDB_H
-#include "resources/npcdialoginfo.h"
-
#include <map>
#include "localconsts.h"
class Widget;
+struct NpcDialogInfo;
+
/**
* Color information database.
*/
diff --git a/src/resources/npcdialoginfo.h b/src/resources/npcdialoginfo.h
index d27804cd5..3886d9bf6 100644
--- a/src/resources/npcdialoginfo.h
+++ b/src/resources/npcdialoginfo.h
@@ -21,13 +21,8 @@
#ifndef RESOURCES_NPCDIALOGINFO_H
#define RESOURCES_NPCDIALOGINFO_H
-#include "resources/npcbuttoninfo.h"
#include "resources/npcdialogmenuinfo.h"
-#include "resources/npcimageinfo.h"
#include "resources/npcinventoryinfo.h"
-#include "resources/npctextinfo.h"
-
-#include "utils/stringvector.h"
#include "localconsts.h"
diff --git a/src/shopitem.cpp b/src/shopitem.cpp
index 0430e4d0f..eb7499522 100644
--- a/src/shopitem.cpp
+++ b/src/shopitem.cpp
@@ -22,7 +22,6 @@
#include "shopitem.h"
-#include "logger.h"
#include "units.h"
#include "resources/iteminfo.h"