From 22d0839b72cb821515cf5ed22636c31c6ea3cf14 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 4 Mar 2002 22:47:06 +0000
Subject: [PATCH] Not to freak out if we have no frames.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1083 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/cast/CharacterSprite.java |  8 +++++---
 src/java/com/threerings/media/sprite/Sprite.java  | 13 +++++++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/java/com/threerings/cast/CharacterSprite.java b/src/java/com/threerings/cast/CharacterSprite.java
index 5abd15e76..59995d82e 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.21 2002/02/19 22:09:08 mdb Exp $
+// $Id: CharacterSprite.java,v 1.22 2002/03/04 22:47:06 mdb Exp $
 
 package com.threerings.cast;
 
@@ -71,7 +71,7 @@ public class CharacterSprite
             setFrames(_frames[_orient]);
 
         } catch (NoSuchComponentException nsce) {
-            Log.warning("Character sprite referneces non-existent " +
+            Log.warning("Character sprite references non-existent " +
                         "component [sprite=" + this + ", err=" + nsce + "].");
         }
     }
@@ -82,7 +82,9 @@ public class CharacterSprite
         super.setOrientation(orient);
 
         // update the sprite frames to reflect the direction
-        setFrames(_frames[orient]);
+        if (_frames != null) {
+            setFrames(_frames[orient]);
+        }
     }
 
     /**
diff --git a/src/java/com/threerings/media/sprite/Sprite.java b/src/java/com/threerings/media/sprite/Sprite.java
index c4ca944f9..0872870b1 100644
--- a/src/java/com/threerings/media/sprite/Sprite.java
+++ b/src/java/com/threerings/media/sprite/Sprite.java
@@ -1,5 +1,5 @@
 //
-// $Id: Sprite.java,v 1.37 2002/02/20 03:13:57 mdb Exp $
+// $Id: Sprite.java,v 1.38 2002/03/04 22:47:06 mdb Exp $
 
 package com.threerings.media.sprite;
 
@@ -198,7 +198,11 @@ public class Sprite implements DirectionCodes
      */
     public void paint (Graphics2D gfx)
     {
-        gfx.drawImage(_frame, _bounds.x, _bounds.y, null);
+        if (_frame != null) {
+            gfx.drawImage(_frame, _bounds.x, _bounds.y, null);
+        } else {
+            gfx.draw(_bounds);
+        }
     }
 
     /**
@@ -435,6 +439,11 @@ public class Sprite implements DirectionCodes
      */
     public void tick (long timestamp)
     {
+        // if we have no frames, we're hosulated (to use a Greenwell term)
+        if (_frames == null) {
+            return;
+        }
+
         int fcount = _frames.getFrameCount();
         boolean moved = false;