[Super-tux-commit] supertux/src tile_manager.cpp,1.4,1.5 tile_manager.h,1.3,1.4

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5160/src

Modified Files:
	tile_manager.cpp tile_manager.h 
Log Message:
Removed commented code.

Index: tile_manager.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile_manager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tile_manager.cpp	5 Aug 2004 18:58:08 -0000	1.4
+++ tile_manager.cpp	5 Aug 2004 19:29:02 -0000	1.5
@@ -74,19 +74,13 @@
 
               Tile* tile = new Tile;
               int tile_id = tile->read(reader);
-              if(tile_id < 0) {
+/*              if(tile_id < 0) {
                 std::cerr 
                   << "Warning: parse error when reading a tile (id < 0), skipping.\n";
                 continue;
-              }
+              }*/
 
               tiles.insert(std::make_pair(tile_id, tile));
-
-/*              tile_id += tileset_id;
-
-              if(tile_id >= int(tiles.size()))
-                tiles.resize(tile_id+1);
-              tiles[tile_id] = tile;*/
             }
           else if (strcmp(lisp_symbol(lisp_car(element)), "tileset") == 0)
             {
@@ -169,19 +163,6 @@
   return i->second;
   }
 return i->second;
-
-/*
-    if(id < tiles.size())
-      {
-        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]; 
-      }*/
 }
 
 /* EOF */

Index: tile_manager.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/tile_manager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tile_manager.h	5 Aug 2004 18:58:08 -0000	1.3
+++ tile_manager.h	5 Aug 2004 19:29:02 -0000	1.4
@@ -45,7 +45,6 @@
   TileManager();
   ~TileManager();
   
-//  std::vector<Tile*> tiles;
   typedef std::map<int, Tile*> Tiles;
   Tiles tiles;