X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fnolok_01.cpp;h=045a507e0aeebc9c0a3c720e967ce8ee51209715;hb=22901c90fe1a4b0d5a6ef8fccb2494699b888e32;hp=61c8b12d77edfeb192f87e97a7341058bc3b9061;hpb=60908c905544776c376421b8d3e12eeb936c068f;p=supertux.git

diff --git a/src/badguy/nolok_01.cpp b/src/badguy/nolok_01.cpp
index 61c8b12d7..045a507e0 100644
--- a/src/badguy/nolok_01.cpp
+++ b/src/badguy/nolok_01.cpp
@@ -63,8 +63,8 @@ Nolok_01::write(lisp::Writer& writer)
 void
 Nolok_01::activate()
 {
-  hitpoints = INITIAL_HITPOINTS;
-  bullet_hitpoints = INITIAL_BULLET_HP;
+  //hitpoints = INITIAL_HITPOINTS;
+  //bullet_hitpoints = INITIAL_BULLET_HP;
   physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
   sprite->set_action(dir == LEFT ? "left" : "right");
   action = WALKING;
@@ -111,6 +111,7 @@ Nolok_01::collision_squished(Player& player)
 {
   bool result = false;
   player.bounce(*this);
+#if 0
   if (hitpoints <= 0) {
     bullet_hitpoints = 0;
     sprite->set_action("dead"); 
@@ -118,6 +119,7 @@ Nolok_01::collision_squished(Player& player)
     Sector::current()->add_object(new Door((int)get_pos().x+32, 512, "sector1", "main2"));
     result = true;
   }
+#endif
   return result;
 }
 
@@ -139,6 +141,7 @@ Nolok_01::collision_solid(GameObject& , const CollisionHit& hit)
 void
 Nolok_01::kill_fall()
 {
+#if 0
   bullet_hitpoints--;
   if (bullet_hitpoints <= 0) {
    hitpoints = 0;
@@ -149,6 +152,7 @@ Nolok_01::kill_fall()
    set_state(STATE_FALLING);
    Sector::current()->add_object(new Door((int)get_pos().x+32, 512, "sector1", "main2"));
   }
+#endif
 }
 
 IMPLEMENT_FACTORY(Nolok_01, "nolok_01")