From 7ffa3087e11ba90498b77de60e61dcb0bd4c2cf7 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 12 Jun 2002 07:00:49 +0000 Subject: [PATCH] Don't switch to a rest action if null is returned by getRestingAction() (used now in YoCharacterSprite) git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1444 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/cast/CharacterSprite.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/java/com/threerings/cast/CharacterSprite.java index 89dba6bd5..c6580d115 100644 --- a/src/java/com/threerings/cast/CharacterSprite.java +++ b/src/java/com/threerings/cast/CharacterSprite.java @@ -1,5 +1,5 @@ // -// $Id: CharacterSprite.java,v 1.32 2002/05/31 03:38:02 mdb Exp $ +// $Id: CharacterSprite.java,v 1.33 2002/06/12 07:00:49 ray Exp $ package com.threerings.cast; @@ -195,7 +195,10 @@ public class CharacterSprite extends ImageSprite // disable animation setAnimationMode(NO_ANIMATION); // come to a halt looking settled and at peace - setActionSequence(getRestingAction()); + String rest = getRestingAction(); + if (rest != null) { + setActionSequence(rest); + } } }