X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftile_manager.cpp;h=391fc5549dd3102651f4556ac5ec7dc98a9650dc;hb=ffaadd80066a2a0f8c30d58ef3466f79e98254d7;hp=5da2fe77f68b10ac31ecf3568cdb512594d51234;hpb=e6a940db5904743e8220491ce10b5107e119a44c;p=supertux.git

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 5da2fe77f..391fc5549 100644
--- a/src/tile_manager.cpp
+++ b/src/tile_manager.cpp
@@ -1,7 +1,8 @@
 //  $Id$
-// 
+//
 //  SuperTux
 //  Copyright (C) 2004 Tobias Glaesser <tobi.web@gmx.de>
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -12,7 +13,7 @@
 //  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
@@ -34,6 +35,8 @@
 #include "tile_manager.hpp"
 #include "resources.hpp"
 
+TileManager* tile_manager = NULL;
+
 TileManager::TileManager(const std::string& filename)
 {
 #ifdef DEBUG
@@ -64,7 +67,7 @@ void TileManager::load_tileset(std::string filename)
   } else {
     tiles_path = filename.substr(0, t+1);
   }
- 
+
   lisp::Parser parser;
   std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
 
@@ -77,13 +80,16 @@ void TileManager::load_tileset(std::string filename)
     if(iter.item() == "tile") {
       Tile* tile = new Tile();
       tile->parse(*(iter.lisp()));
-      while(tile->id >= tiles.size()) {
-        tiles.push_back(0);
-      }
+
+      if(tile->id >= tiles.size())
+        tiles.resize(tile->id+1, 0);
+
       if(tiles[tile->id] != 0) {
         log_warning << "Tile with ID " << tile->id << " redefined" << std::endl;
+        delete tile;
+      } else {
+        tiles[tile->id] = tile;
       }
-      tiles[tile->id] = tile;
     } else if(iter.item() == "tilegroup") {
       TileGroup tilegroup;
       const lisp::Lisp* tilegroup_lisp = iter.lisp();
@@ -98,7 +104,7 @@ void TileManager::load_tileset(std::string filename)
       std::string image;
 
       // width and height of the image in tile units, this is used for two
-      // purposes: 
+      // purposes:
       //  a) so we don't have to load the image here to know its dimensions
       //  b) so that the resulting 'tiles' entry is more robust,
       //  ie. enlarging the image won't break the tile id mapping
@@ -131,15 +137,37 @@ void TileManager::load_tileset(std::string filename)
               int x = 32*(i % width);
               int y = 32*(i / width);
               Tile* tile = new Tile(ids[i], attributes[i], Tile::ImageSpec(image, Rect(x, y, x + 32, y + 32)));
-              tiles[ids[i]] = tile;
+              if (tiles[ids[i]] == 0) {
+                tiles[ids[i]] = tile;
+              } else {
+                log_warning << "Tile with ID " << ids[i] << " redefined" << std::endl;
+                delete tile;
+              }
             }
         }
-      
+
     } else if(iter.item() == "properties") {
       // deprecated
     } else {
       log_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl;
     }
   }
-}
 
+  if (0)
+    { // enable this if you want to see a list of free tiles
+      log_info << "Last Tile ID is " << tiles.size()-1 << std::endl;
+      int last = -1;
+      for(int i = 0; i < int(tiles.size()); ++i)
+        {
+          if (tiles[i] == 0 && last == -1)
+            {
+              last = i;
+            }
+          else if (tiles[i] && last != -1)
+            {
+              log_info << "Free Tile IDs (" << i - last << "): " << last << " - " << i-1 << std::endl;
+              last = -1;
+            }
+        }
+    }
+}