- fixed the bouncybrick artifact bug

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index e72fbee..80de062 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -24,11 +24,11 @@
 #include <set>
 #include <map>
 #include <vector>
+
 #include "screen/texture.h"
 #include "globals.h"
 #include "lispreader.h"
 #include "setup.h"
-#include "polygon.h"
 #include "vector.h"
 
 class LispReader;
@@ -76,7 +76,7 @@ public:
   };
 
   /** tile attributes */
-  uint32_t attributes;
+  Uint32 attributes;
   
   /** General purpose data attached to a tile (content of a box, type of coin)*/
   int data;
@@ -141,17 +141,18 @@ class TileManager
       const Vector& pos, int layer);
   
   static std::set<TileGroup>* tilegroups() { if(!instance_) { instance_ = new TileManager(); } return tilegroups_ ? tilegroups_ : tilegroups_ = new std::set<TileGroup>; }
-  Tile* get(unsigned int id) {
+  Tile& get(unsigned int id) {
+
     if(id < tiles.size())
       {
-        return tiles[id]; 
+        return *tiles[id]; 
       }
     else
       {
         // Never return 0, but return the 0th tile instead so that
         // user code doesn't have to check for NULL pointers all over
         // the place
-        return tiles[0]; 
+        return *tiles[0]; 
       } 
   }
 };