diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-05 21:49:04 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-06 12:12:22 +0300 |
| commit | 2bd59adc7c456ce6f377feac8bc838e8011ebfc8 (patch) | |
| tree | f2f25428e42e59b9a6d55d7c0be9a99c42e96e40 /src/resources | |
| parent | ac1ef6b19f5c1405cfaa239ab367a93b17043723 (diff) | |
| download | manaverse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.gz manaverse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.bz2 manaverse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.tar.xz manaverse-2bd59adc7c456ce6f377feac8bc838e8011ebfc8.zip | |
Fix code style.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/map/map.cpp | 2 | ||||
| -rw-r--r-- | src/resources/map/mapitem.cpp | 2 | ||||
| -rw-r--r-- | src/resources/map/maplayer.cpp | 2 | ||||
| -rw-r--r-- | src/resources/resourcemanager.cpp | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index 7bad7ee3d..6c27a9a87 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -37,6 +37,8 @@ #include "being/localplayer.h" +#include "gui/userpalette.h" + #include "particle/particle.h" #include "resources/ambientlayer.h" diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 29f2b8eff..16aa5794e 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -20,8 +20,6 @@ #include "resources/map/mapitem.h" -#include "enums/gui/usercolorid.h" - #include "gui/gui.h" #include "gui/userpalette.h" diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp index 584d5702b..03afd6012 100644 --- a/src/resources/map/maplayer.cpp +++ b/src/resources/map/maplayer.cpp @@ -30,6 +30,8 @@ #include "being/localplayer.h" +#include "gui/userpalette.h" + #include "render/graphics.h" #include "resources/image.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index a0efb224f..9985ec67d 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -52,6 +52,7 @@ #endif #include <SDL_image.h> +#include <sstream> #include <sys/time.h> |