From 52ca22c53a107a2d4827fc92a22599c62eb7c412 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Thu, 19 Aug 2010 21:07:46 +0000 Subject: [PATCH] Fix some wacky assumptions about the similarity of types being compared. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@992 ed5b42cb-e716-0410-a449-f6a68f950b19 --- src/java/com/threerings/miso/client/DirtyItemList.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/miso/client/DirtyItemList.java b/src/java/com/threerings/miso/client/DirtyItemList.java index b70d0b8b..4541e4a6 100644 --- a/src/java/com/threerings/miso/client/DirtyItemList.java +++ b/src/java/com/threerings/miso/client/DirtyItemList.java @@ -595,10 +595,11 @@ public class DirtyItemList // it would break something... if ((da.obj instanceof MultiTileSprite || db.obj instanceof MultiTileSprite) && (da.lx <= db.rx && da.rx >= db.lx && da.ry <= db.ly && da.ly >= db.ry)) { - Sprite as = (Sprite)da.obj, bs = (Sprite)db.obj; + int aRender = (da.obj instanceof Sprite) ? ((Sprite)da.obj).getRenderOrder() : 0; + int bRender = (db.obj instanceof Sprite) ? ((Sprite)db.obj).getRenderOrder() : 0; // we're comparing two sprites co-existing on the same // tile, first check their render order - int rocomp = as.getRenderOrder() - bs.getRenderOrder(); + int rocomp = aRender - bRender; if (rocomp != 0) { return rocomp; }