fix cr/lfs and remove trailing whitespaces...

[supertux.git] / src / tile_manager.cpp

diff --git a/src/tile_manager.cpp b/src/tile_manager.cpp
index 5da2fe7..bbc3cff 100644 (file)
--- 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));
 
@@ -98,7 +101,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
@@ -134,7 +137,7 @@ void TileManager::load_tileset(std::string filename)
               tiles[ids[i]] = tile;
             }
         }
-      
+
     } else if(iter.item() == "properties") {
       // deprecated
     } else {
@@ -142,4 +145,3 @@ void TileManager::load_tileset(std::string filename)
     }
   }
 }
-