Added a flickering cursor for input menu fields. The code is kinda of sucky, so feel...

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index e212d49..90225d6 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,14 +25,48 @@
 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";
+  std::string filename = datadir + "/images/tilesets/supertux.stgt";
   load_tileset(filename);
 }
 
+TileManager::~TileManager()
+{
+  for(std::vector<Tile*>::iterator i = tiles.begin(); i != tiles.end(); ++i) {
+    delete *i;                                                                  
+  }
+}
+
 void TileManager::load_tileset(std::string filename)
 {
+  if(filename == current_tileset)
+    return;
+  
+  // 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)
@@ -50,6 +93,7 @@ void TileManager::load_tileset(std::string filename)
               tile->water   = false;
               tile->fullbox = false;
               tile->distro  = false;
+              tile->goal    = false;
               tile->data    = 0;
               tile->next_tile  = 0;
               tile->anim_speed = 25;
@@ -62,6 +106,7 @@ void TileManager::load_tileset(std::string filename)
               reader.read_bool("water",     &tile->water);
               reader.read_bool("fullbox",   &tile->fullbox);
               reader.read_bool("distro",    &tile->distro);
+              reader.read_bool("goal",      &tile->goal);
               reader.read_int("data",       &tile->data);
               reader.read_int("anim-speed", &tile->anim_speed);
               reader.read_int("next-tile",  &tile->next_tile);
@@ -76,7 +121,7 @@ void TileManager::load_tileset(std::string filename)
                   Surface* cur_image;
                   tile->images.push_back(cur_image);
                   tile->images[tile->images.size()-1] = new Surface(
-                               datadir +  "images/tilesets/" + (*it),
+                               datadir +  "/images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
               for(std::vector<std::string>::iterator it = editor_filenames.begin();
@@ -86,7 +131,7 @@ void TileManager::load_tileset(std::string filename)
                   Surface* cur_image;
                   tile->editor_images.push_back(cur_image);
                   tile->editor_images[tile->editor_images.size()-1] = new Surface(
-                               datadir +  "images/tilesets/" + (*it),
+                               datadir + "/images/tilesets/" + (*it),
                                USE_ALPHA);
                 }
                
@@ -101,7 +146,7 @@ void TileManager::load_tileset(std::string filename)
               LispReader reader(lisp_cdr(element));
               std::string filename;
               reader.read_string("file",  &filename);
-              filename = datadir + "images/tilesets/" + filename;
+              filename = datadir + "/images/tilesets/" + filename;
               load_tileset(filename);
             }
           else if (strcmp(lisp_symbol(lisp_car(element)), "tilegroup") == 0)
@@ -133,6 +178,9 @@ void TileManager::load_tileset(std::string filename)
     {
       assert(0);
     }
+
+  lisp_free(root_obj);
+  current_tileset = filename;
 }
 
 void