- memleak fix and menu fix from MatzeB

[supertux.git] / src / tile.h

diff --git a/src/tile.h b/src/tile.h
index 721b010..740ce9b 100644 (file)
--- a/src/tile.h
+++ b/src/tile.h
@@ -1,14 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
-// C++ Interface: tile
-//
-// Description: 
-//
-//
-// Author: Tobias Glaesser <tobi.web@gmx.de>, (C) 2004
-//
-// Copyright: See COPYING file that comes with this distribution
-//
+//  This program is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU General Public License
+//  as published by the Free Software Foundation; either version 2
+//  of the License, or (at your option) any later version.
 //
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  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 TILE_H
 #define TILE_H
 
@@ -22,12 +31,16 @@
 /**
 Tile Class
 */
-struct Tile
+class Tile
 {
+public:
+  Tile();
+  ~Tile();
+
   int id;
 
-  std::vector<texture_type> images;
-  std::vector<texture_type> editor_images;
+  std::vector<Surface*> images;
+  std::vector<Surface*> editor_images;
   
   std::vector<std::string>  filenames;
 
@@ -40,6 +53,9 @@ struct Tile
   /** FIXME: ? */
   bool ice;
 
+  /** water */
+  bool water;
+
   /** Bonusbox, content is stored in \a data */
   bool fullbox;
 
@@ -54,6 +70,9 @@ struct Tile
   int next_tile;
 
   int anim_speed;
+  
+  /** Draw a tile on the screen: */
+  static void draw(float x, float y, unsigned int c, Uint8 alpha = 255);
 };
 
 struct TileGroup
@@ -89,6 +108,4 @@ class TileManager
   }
 };
 
-
-
 #endif