- memleak fix and menu fix from MatzeB

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index daa63f9..2f66221 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1,14 +1,23 @@
+//  $Id$
+// 
+//  SuperTux
+//  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
 //
-// C++ Implementation: 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.
+
 #include "tile.h"
 #include "scene.h"
 #include "assert.h"
@@ -16,6 +25,24 @@
 TileManager* TileManager::instance_  = 0;
 std::vector<TileGroup>* TileManager::tilegroups_  = 0;
 
+Tile::Tile()
+{
+}
+
+Tile::~Tile()
+{
+  for(std::vector<Surface*>::iterator i = images.begin(); i != images.end();
+      ++i) {
+    delete *i;
+  }
+  for(std::vector<Surface*>::iterator i = editor_images.begin();
+      i != editor_images.end(); ++i) {
+    delete *i;                                                                
+  }
+}
+
+//---------------------------------------------------------------------------
+
 TileManager::TileManager()
 {
   std::string filename = datadir +  "images/tilesets/supertux.stgt";
@@ -24,6 +51,12 @@ TileManager::TileManager()
 
 void TileManager::load_tileset(std::string filename)
 {
+  // free old tiles
+  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
+    delete *i;
+  }
+  tiles.clear();
+ 
   lisp_object_t* root_obj = lisp_read_from_file(filename);
 
   if (!root_obj)
@@ -73,9 +106,9 @@ void TileManager::load_tileset(std::string filename)
                   it != tile->filenames.end();
                   ++it)
                 {
-                  texture_type cur_image;
+                  Surface* cur_image;
                   tile->images.push_back(cur_image);
-                  texture_load(&tile->images[tile->images.size()-1],
+                  tile->images[tile->images.size()-1] = new Surface(
                                datadir +  "images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
@@ -83,9 +116,9 @@ void TileManager::load_tileset(std::string filename)
                   it != editor_filenames.end();
                   ++it)
                 {
-                  texture_type cur_image;
+                  Surface* cur_image;
                   tile->editor_images.push_back(cur_image);
-                  texture_load(&tile->editor_images[tile->editor_images.size()-1],
+                  tile->editor_images[tile->editor_images.size()-1] = new Surface(
                                datadir +  "images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
@@ -133,6 +166,8 @@ void TileManager::load_tileset(std::string filename)
     {
       assert(0);
     }
+
+  lisp_free(root_obj);
 }
 
 void
@@ -145,11 +180,11 @@ Tile::draw(float x, float y, unsigned int c, Uint8 alpha)
         {
           if(ptile->images.size() > 1)
             {
-              texture_draw(&ptile->images[( ((global_frame_counter*25) / ptile->anim_speed) % (ptile->images.size()))],x,y, alpha);
+              ptile->images[( ((global_frame_counter*25) / ptile->anim_speed) % (ptile->images.size()))]->draw(x,y, alpha);
             }
           else if (ptile->images.size() == 1)
             {
-              texture_draw(&ptile->images[0],x,y, alpha);
+              ptile->images[0]->draw(x,y, alpha);
             }
           else
             {