From: Ricardo Cruz Date: Fri, 13 Aug 2004 22:22:47 +0000 (+0000) Subject: Should fix arm crash. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0807a679ad2d5af8e2e5fe89f43132ba11171c79;p=supertux.git Should fix arm crash. SVN-Revision: 1769 --- diff --git a/data/supertux.strf b/data/supertux.strf index 802b084ca..0502e07e4 100644 --- a/data/supertux.strf +++ b/data/supertux.strf @@ -88,14 +88,15 @@ (y-hotspot 9) (images "shared/smalltux-kick-right-0.png"))) - (sprite (name "arm-grab-left") + (sprite (name "tux-arm") (action + (name "grab-left") (x-hotspot 5) (y-hotspot 9) - (images "shared/smalltux-grab-left-0.png"))) + (images "shared/smalltux-grab-left-0.png")) - (sprite (name "smalltux-grab-right") - (action + (action + (name "grab-right") (x-hotspot 5) (y-hotspot 9) (images "shared/smalltux-grab-right-0.png"))) diff --git a/src/player.cpp b/src/player.cpp index f4af22af3..574c47831 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -787,9 +787,9 @@ Player::draw(DrawingContext& context) if ((holding_something && physic.get_velocity_y() == 0) || shooting_timer.check() && !duck) { if (dir == RIGHT) - tux_arm->set_action("walk-right"); + tux_arm->set_action("grab-right"); else - tux_arm->set_action("walk-left"); + tux_arm->set_action("grab-left"); tux_arm->draw(context, pos, LAYER_OBJECTS + 1); }