Renamed namespaces to all lowercase

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

diff --git a/src/worldmap/sprite_change.hpp b/src/worldmap/sprite_change.hpp
index 1e2eb89..0f7843e 100644 (file)
--- a/src/worldmap/sprite_change.hpp
+++ b/src/worldmap/sprite_change.hpp
@@ -21,41 +21,20 @@
 #include <memory>
 #include <string>
 
-#include "lisp/lisp.hpp"
+#include "util/reader_fwd.hpp"
 #include "math/vector.hpp"
 #include "supertux/game_object.hpp"
 
 class Sprite;
 
-namespace WorldMapNS {
+namespace worldmap {
 
 class SpriteChange : public GameObject
 {
 public:
-  SpriteChange(const lisp::Lisp* lisp);
+  SpriteChange(const Reader& lisp);
   virtual ~SpriteChange();
 
-  Vector pos;
-  /**
-   * should tuxs sprite change when the tile has been completely entered,
-   * or already when the tile was just touched
-   */
-  bool change_on_touch;
-  /// sprite to change tux image to
-  std::auto_ptr<Sprite> sprite;
-  /**
-   * stay action can be used for objects like boats or cars, if it is
-   * != "" then this sprite will be displayed when tux left the tile towards
-   * another SpriteChange object.
-   */
-  std::string stay_action;
-
-  /**
-   * name of a group in which only one SpriteChange will ever have its stay_action displayed.
-   * Leave empty if you don't care.
-   */
-  std::string stay_group;
-
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
@@ -69,17 +48,34 @@ public:
    */
   void clear_stay_action();
 
+public:
+  Vector pos;
+
+  /** should tuxs sprite change when the tile has been completely entered,
+      or already when the tile was just touched */
+  bool change_on_touch;
+
+  /** sprite to change tux image to */
+  std::auto_ptr<Sprite> sprite;
+
+  /** stay action can be used for objects like boats or cars, if it is
+      != "" then this sprite will be displayed when tux left the tile
+      towards another SpriteChange object. */
+  std::string stay_action;
+
+  /** name of a group in which only one SpriteChange will ever have
+      its stay_action displayed.  Leave empty if you don't care. */
+  std::string stay_group;
+
 private:
-  /**
-   * should the stayaction be displayed
-   */
+  /** should the stayaction be displayed */
   bool in_stay_action;
 
+private:
   static std::list<SpriteChange*> all_sprite_changes;
-
 };
 
-}
+} // namespace worldmap
 
 #endif