use spike flag again and don't replace spikes with objects

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

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 045a507..925e4de 100644 (file)
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -20,9 +20,9 @@
 
 #include <config.h>
 
-#include "nolok_01.h"
-#include "badguy/bouncing_snowball.h"
-#include "trigger/door.h"
+#include "nolok_01.hpp"
+#include "badguy/bouncing_snowball.hpp"
+#include "trigger/door.hpp"
 
 #define WALK_TIME 2.5
 #define SHOOT_TIME 0.4
@@ -39,6 +39,7 @@ Nolok_01::Nolok_01(const lisp::Lisp& reader)
   reader.get("y", start_position.y);
   bbox.set_size(31.8, 63.8);
   sprite = sprite_manager->create("dummyguy");
+  countMe = false;
 }
 
 Nolok_01::Nolok_01(float pos_x, float pos_y)
@@ -47,6 +48,7 @@ Nolok_01::Nolok_01(float pos_x, float pos_y)
   start_position.y = pos_y;
   bbox.set_size(31.8, 63.8);
   sprite = sprite_manager->create("dummyguy");
+  countMe = false;
 }
 
 void
@@ -72,7 +74,7 @@ Nolok_01::activate()
 }
 
 void
-Nolok_01::active_action(float elapsed_time)
+Nolok_01::active_update(float elapsed_time)
 {
    if (action_timer.check()) {
      switch (action) {       
@@ -145,7 +147,7 @@ Nolok_01::kill_fall()
   bullet_hitpoints--;
   if (bullet_hitpoints <= 0) {
    hitpoints = 0;
-   sound_manager->play_sound("fall", this,
+   sound_manager->play("sounds/fall.wav", this,
                              Sector::current()->player->get_pos());
    physic.set_velocity_y(0);
    physic.enable_gravity(true);