diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-10-06 21:23:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-10-06 21:23:56 +0300 |
| commit | 1bdd9ffe4bb71e3e18fbd6975049198b2db69196 (patch) | |
| tree | 63ca1ad2377b007507c521d22422af6d2ed59b6a | |
| parent | 99576de4f4737e2d4f0a2654d52ca777c1773590 (diff) | |
| download | mv-1bdd9ffe4bb71e3e18fbd6975049198b2db69196.tar.gz mv-1bdd9ffe4bb71e3e18fbd6975049198b2db69196.tar.bz2 mv-1bdd9ffe4bb71e3e18fbd6975049198b2db69196.tar.xz mv-1bdd9ffe4bb71e3e18fbd6975049198b2db69196.zip | |
Fix code style.
| -rw-r--r-- | src/being/flooritem.h | 4 | ||||
| -rw-r--r-- | src/enums/gui/npcactionstate.h | 4 | ||||
| -rw-r--r-- | src/gui/gui.h | 2 | ||||
| -rw-r--r-- | src/resources/mapreader.cpp | 1 | ||||
| -rw-r--r-- | src/resources/mapreader.h | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/being/flooritem.h b/src/being/flooritem.h index 28e5c7190..7803c6cac 100644 --- a/src/being/flooritem.h +++ b/src/being/flooritem.h @@ -25,6 +25,8 @@ #include "const/resources/item/cards.h" +#include "enums/resources/cursor.h" + #include "enums/resources/item/itemtype.h" #include "enums/simpletypes/damaged.h" @@ -33,8 +35,6 @@ #include "being/actorsprite.h" -#include "resources/cursors.h" - class ItemInfo; /** diff --git a/src/enums/gui/npcactionstate.h b/src/enums/gui/npcactionstate.h index de6398e99..5a94a9015 100644 --- a/src/enums/gui/npcactionstate.h +++ b/src/enums/gui/npcactionstate.h @@ -25,6 +25,10 @@ #include "enums/simpletypes/enumdefines.h" +#ifdef INPUT +#undef +#endif // INPUT + enumStart(NpcActionState) { WAIT = 0, diff --git a/src/gui/gui.h b/src/gui/gui.h index c78406c01..9a8e7b14f 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -71,7 +71,7 @@ #include "enums/events/mousebutton.h" #include "enums/events/mouseeventtype.h" -#include "resources/cursors.h" +#include "enums/resources/cursor.h" #include <deque> #include <list> diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 121407267..f0f43d225 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -35,6 +35,7 @@ #include "resources/map/map.h" #include "resources/map/mapheights.h" +#include "resources/map/maplayer.h" #include "resources/map/tileset.h" #include "resources/beingcommon.h" diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 911c295ca..2cf4e0540 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -27,10 +27,9 @@ #include "utils/xml.h" -#include "resources/map/maplayer.h" - class Map; class MapHeights; +class MapLayer; class Properties; class Resource; class Tileset; |