From 5a1cc887440b593ae59b6d720c6cdd7628138f26 Mon Sep 17 00:00:00 2001 From: Nathan Curtis Date: Tue, 7 Aug 2012 17:43:41 -0700 Subject: [PATCH] Use a safe comparison instead of simple subtraction. Vilya's ScoreAnimation sets its render order to Integer.MAX_VALUE; using this comparison method gets the AbstractMediaManager's _media out of order when such values are used. --- core/src/main/java/com/threerings/media/AbstractMedia.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/threerings/media/AbstractMedia.java b/core/src/main/java/com/threerings/media/AbstractMedia.java index 261a999f..63f10c6f 100644 --- a/core/src/main/java/com/threerings/media/AbstractMedia.java +++ b/core/src/main/java/com/threerings/media/AbstractMedia.java @@ -27,6 +27,8 @@ import java.awt.geom.PathIterator; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; +import com.google.common.primitives.Ints; + import com.samskivert.util.ObserverList; import com.samskivert.util.StringUtil; @@ -164,7 +166,7 @@ public abstract class AbstractMedia */ public int renderCompareTo (AbstractMedia other) { - int result = _renderOrder - other._renderOrder; + int result = Ints.compare(_renderOrder, other._renderOrder); return (result != 0) ? result : naturalCompareTo(other); }