AfflictionNetworks/nenya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some wacky assumptions about the similarity of types being compared.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@992 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Mike Thomas
2010-08-19 21:07:46 +00:00
parent 1e1c8a47fc
commit 52ca22c53a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/miso/client/DirtyItemList.java
+3 -2
View File
@@ -595,10 +595,11 @@ public class DirtyItemList
// it would break something... // it would break something...
if ((da.obj instanceof MultiTileSprite || db.obj instanceof MultiTileSprite) && 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)) { (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 // we're comparing two sprites co-existing on the same
// tile, first check their render order // tile, first check their render order
int rocomp = as.getRenderOrder() - bs.getRenderOrder(); int rocomp = aRender - bRender;
if (rocomp != 0) { if (rocomp != 0) {
return rocomp; return rocomp;
} }