Fixed include structure in resource/ directory

There is also a new rule that trivial constructors and destructors
should no longer be trivially "documented", since this just takes up
space with no gain.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/resources/image.h b/src/resources/image.h
index 260aeeba..3cfb9216 100644
--- a/src/resources/image.h
+++ b/src/resources/image.h
@@ -22,9 +22,11 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include <SDL.h>
+#include "main.h"
+
+#include "resources/resource.h"
 
-#include "../main.h"
+#include <SDL.h>
 
 #ifdef USE_OPENGL
 
@@ -37,8 +39,6 @@
 #include <SDL_opengl.h>
 #endif
 
-#include "resource.h"
-
 class Dye;
 class Position;
 
@@ -120,7 +120,7 @@ class Image : public Resource
         /**
          * Returns the alpha value of this image.
          */
-        float getAlpha();
+        float getAlpha() const;
 
 #ifdef USE_OPENGL
         /**
@@ -137,7 +137,7 @@ class Image : public Resource
          * improve overall framerates. Don't use unless you are using it to
          * reduce the number of overall layers that need to be drawn through SDL.
          */
-        Image* merge(Image* image, const Position& pos);
+        Image *merge(Image *image, int x, int y);
 
     protected:
         /**