Idle change.

SVN-Revision: 1805

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index 7b6651c..39eda45 100644 (file)
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -93,18 +93,6 @@
          (y-hotspot 9)
          (images "shared/bigtux/arms-stand-right-0.png"))
 
-       (action
-         (name "idle-left")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/bigtux/arms-stand-left-0.png"))
-
-       (action
-         (name "idle-right")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/bigtux/arms-stand-right-0.png"))
-
 ; Grabbing is arms specific!
        (action
          (name "grab-left")
@@ -295,18 +283,6 @@
          (name "buttjump-right")
          (x-hotspot 5)
          (y-hotspot 9)
-         (images "shared/bigtux/body-stand-right-0.png"))
-
-       (action
-         (name "idle-left")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/bigtux/body-stand-left-0.png"))
-
-       (action
-         (name "idle-right")
-         (x-hotspot 6)
-         (y-hotspot 8)
          (images "shared/bigtux/body-stand-right-0.png")))
 
 ;; Big Tux Feet
@@ -398,20 +374,7 @@
          (name "buttjump-right")
          (x-hotspot 5)
          (y-hotspot 9)
-         (images "shared/bigtux/feet-buttjump-right-0.png"))
-
-
-       (action
-         (name "idle-left")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/bigtux/feet-stand-left-0.png"))
-
-       (action
-         (name "idle-right")
-         (x-hotspot 6)
-         (y-hotspot 8)
-         (images "shared/bigtux/feet-stand-right-0.png")))
+         (images "shared/bigtux/feet-buttjump-right-0.png")))
 
 ; End of Big Tux (no power) sprite
 
@@ -499,6 +462,7 @@
 
        (action
          (name "idle-left")
+         (fps 1.0)
          (x-hotspot 6)
          (y-hotspot 8)
          (images "shared/bigtux/head-idle-blink-left-0.png"
@@ -506,6 +470,7 @@
 
        (action
          (name "idle-right")
+         (fps 1.0)
          (x-hotspot 6)
          (y-hotspot 8)
          (images "shared/bigtux/head-idle-blink-right-0.png"

diff --git a/src/player.cpp b/src/player.cpp
index edd4b24..59dd6ae 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -820,22 +820,22 @@ Player::draw(DrawingContext& context)
             }
         }
     }
-/*
+
   if(idle_timer.get_left() < 0)
     {
     if (dir == RIGHT)
       {
-      tux_body->set_action("idle-right");
-      tux_body->one_time_animation();
+      tux_body->head->set_action("idle-right");
+      tux_body->head->start_animation(1);
       }
     else
       {
-      tux_body->set_action("idle-left");
-      tux_body->one_time_animation();
+      tux_body->head->set_action("idle-right");
+      tux_body->head->start_animation(1);
       }
     idle_timer.start(IDLE_TIME);
     }
-*/
+
   // Tux is holding something
   if ((holding_something && physic.get_velocity_y() == 0) ||
       shooting_timer.check() && !duck)