- just doing some C++ifying

[supertux.git] / src / screen / drawing_context.h

diff --git a/src/screen/drawing_context.h b/src/screen/drawing_context.h
index ea38c4c..0051301 100644 (file)
--- a/src/screen/drawing_context.h
+++ b/src/screen/drawing_context.h
@@ -16,15 +16,16 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __DRAWINGCONTEXT_H__
-#define __DRAWINGCONTEXT_H__
+#ifndef SUPERTUX_DRAWINGCONTEXT_H
+#define SUPERTUX_DRAWINGCONTEXT_H
 
-#include <stdint.h>
 #include <vector>
 #include <string>
+
+#include "SDL.h"
+
 #include "vector.h"
 #include "screen.h"
-#include <SDL.h>
 
 class Surface;
 class Font;
@@ -38,7 +39,8 @@ enum {
   LAYER_OBJECTS = 100,
   LAYER_FOREGROUNDTILES = 200,
   LAYER_FOREGROUND0 = 300,
-  LAYER_FOREGROUND1 = 400
+  LAYER_FOREGROUND1 = 400,
+  LAYER_GUI         = 500
 };
 
 class Color
@@ -71,11 +73,11 @@ public:
 
   /** Adds a drawing request for a surface into the request list */
   void draw_surface(const Surface* surface, const Vector& position, int layer,
-      uint32_t drawing_effect = NONE_EFFECT);
+      Uint32 drawing_effect = NONE_EFFECT);
   /** Adds a drawing request for part of a surface */
   void draw_surface_part(const Surface* surface, const Vector& source,
       const Vector& size, const Vector& dest, int layer,
-      uint32_t drawing_effect = NONE_EFFECT);
+      Uint32 drawing_effect = NONE_EFFECT);
   /** draws a text */
   void draw_text(Font* font, const std::string& text, const Vector& position,
       int layer);
@@ -148,7 +150,7 @@ private:
   struct DrawingRequest
   {
     int layer;
-    uint32_t drawing_effect;
+    Uint32 drawing_effect;
 
     RequestType type;
     Vector pos;
@@ -170,5 +172,5 @@ private:
   DrawingRequests drawingrequests;
 };
 
-#endif
+#endif /*SUPERTUX_DRAWINGCONTEXT_H*/