Renamed namespaces to all lowercase

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

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index 6aff3c6..e35c558 100644 (file)
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -17,26 +17,32 @@
 
 #include "sprite/sprite.hpp"
 #include "sprite/sprite_manager.hpp"
+#include "util/reader.hpp"
 #include "video/drawing_context.hpp"
 #include "worldmap/sprite_change.hpp"
 
-namespace WorldMapNS {
+namespace worldmap {
 
-SpriteChange::SpriteChange(const lisp::Lisp* lisp)
-  : change_on_touch(false), in_stay_action(false)
+SpriteChange::SpriteChange(const Reader& lisp) :
+  pos(),
+  change_on_touch(false), 
+  sprite(),
+  stay_action(),
+  stay_group(),
+  in_stay_action(false)
 {
-  lisp->get("x", pos.x);
-  lisp->get("y", pos.y);
-  lisp->get("change-on-touch", change_on_touch);
+  lisp.get("x", pos.x);
+  lisp.get("y", pos.y);
+  lisp.get("change-on-touch", change_on_touch);
 
   std::string spritefile = "";
-  lisp->get("sprite", spritefile);
+  lisp.get("sprite", spritefile);
   sprite = sprite_manager->create(spritefile);
 
-  lisp->get("stay-action", stay_action);
-  lisp->get("initial-stay-action", in_stay_action);
+  lisp.get("stay-action", stay_action);
+  lisp.get("initial-stay-action", in_stay_action);
 
-  lisp->get("stay-group", stay_group);
+  lisp.get("stay-group", stay_group);
 
   all_sprite_changes.push_back(this);
 }