diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-11-07 00:05:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-11-07 00:05:36 +0300 |
| commit | a0f7d665da88809186f535401fb5de85286f7af3 (patch) | |
| tree | e2ff024edb813e974ca70dad70049a6d06e29528 /src/resources | |
| parent | eb49768b0908dcd90f26a6bb381e864d0cd5e550 (diff) | |
| download | mv-a0f7d665da88809186f535401fb5de85286f7af3.tar.gz mv-a0f7d665da88809186f535401fb5de85286f7af3.tar.bz2 mv-a0f7d665da88809186f535401fb5de85286f7af3.tar.xz mv-a0f7d665da88809186f535401fb5de85286f7af3.zip | |
fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/db/npcdialogdb.cpp | 1 | ||||
| -rw-r--r-- | src/resources/db/npcdialogdb.h | 4 | ||||
| -rw-r--r-- | src/resources/npcdialoginfo.h | 5 |
3 files changed, 3 insertions, 7 deletions
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" |