Removed trailing whitespace from all *.?pp files

[supertux.git] / src / worldmap / worldmap.hpp

diff --git a/src/worldmap/worldmap.hpp b/src/worldmap/worldmap.hpp
index 29cd50f..4e5d43f 100644 (file)
--- a/src/worldmap/worldmap.hpp
+++ b/src/worldmap/worldmap.hpp
@@ -1,5 +1,5 @@
 //  SuperTux
-//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmx.de>
+//  Copyright (C) 2004 Ingo Ruhnke <grumbel@gmail.com>
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
 //  This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,6 @@
 #include "worldmap/teleporter.hpp"
 
 class Sprite;
-class Menu;
 class GameObject;
 class TileMap;
 class PlayerStatus;
@@ -85,8 +84,6 @@ private:
 
   static WorldMap* current_;
 
-  std::auto_ptr<Menu> worldmap_menu;
-
   Vector camera_offset;
 
   std::string name;
@@ -130,7 +127,7 @@ public:
   ~WorldMap();
 
   void add_object(GameObject* object);
-  
+
   void try_expose(GameObject* object);
   void try_unexpose(GameObject* object);
 
@@ -148,13 +145,13 @@ public:
   Vector get_next_tile(Vector pos, Direction direction);
 
   /**
-   * gets a bitfield of Tile::WORLDMAP_NORTH | Tile::WORLDMAP_WEST | ... values, 
+   * gets a bitfield of Tile::WORLDMAP_NORTH | Tile::WORLDMAP_WEST | ... values,
    * which indicates the directions Tux can move to when at the given position.
    */
   int available_directions_at(Vector pos);
 
   /**
-   * returns a bitfield representing the union of all Tile::WORLDMAP_XXX values 
+   * returns a bitfield representing the union of all Tile::WORLDMAP_XXX values
    * of all solid tiles at the given position
    */
   int tile_data_at(Vector pos);
@@ -234,6 +231,8 @@ private:
 
   Vector get_camera_pos_for_tux();
   void clamp_camera_position(Vector& c);
+  Vector last_position;
+  float last_target_time;
 
 private:
   WorldMap(const WorldMap&);