changed worldmap to be stored inside the same directory as the levelsubset, fixed...

[supertux.git] / src / badguy / nolok_01.cpp

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 1090d97..1a5768f 100644 (file)
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -6,16 +6,16 @@
 
 #define WALK_TIME 2.5
 #define SHOOT_TIME 0.4
-#define JUMP_TIME 0.3
+#define JUMP_TIME 0.5
 
 static const float WALKSPEED = 90;
 
 //TODO: Create sprite, give multiple hitpoints, limit max number of snowballs
 //      Stop actions when pause button is hit (probably a general problem of timers)
-Nolok_01::Nolok_01(LispReader& reader)
+Nolok_01::Nolok_01(const lisp::Lisp& reader)
 {
-  reader.read_float("x", start_position.x);
-  reader.read_float("y", start_position.y);
+  reader.get("x", start_position.x);
+  reader.get("y", start_position.y);
   bbox.set_size(31.8, 63.8);
   sprite = sprite_manager->create("dummyguy");
 }
@@ -29,12 +29,12 @@ Nolok_01::Nolok_01(float pos_x, float pos_y)
 }
 
 void
-Nolok_01::write(LispWriter& writer)
+Nolok_01::write(lisp::Writer& writer)
 {
   writer.start_list("nolok01");
 
-  writer.write_float("x", get_pos().x);
-  writer.write_float("y", get_pos().y);
+  writer.write_float("x", start_position.x);
+  writer.write_float("y", start_position.y);
 
   writer.end_list("nolok01");
 }
@@ -55,6 +55,7 @@ Nolok_01::active_action(float elapsed_time)
      switch (action) {       
        case WALKING:
         {
+         sprite->set_action("jump");
          physic.set_velocity_y(700);
          action = JUMPING;
          action_timer.start(JUMP_TIME);