From 511f2e13ee7ed9f973003de68657ef6420fa9ca5 Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Thu, 18 Oct 2001 20:24:05 +0000 Subject: [PATCH] Fixed bug in checking whether two objects overlap horizontally. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@494 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/miso/client/util/IsoUtil.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/java/com/threerings/miso/client/util/IsoUtil.java b/src/java/com/threerings/miso/client/util/IsoUtil.java index 082f36654..20ef583a6 100644 --- a/src/java/com/threerings/miso/client/util/IsoUtil.java +++ b/src/java/com/threerings/miso/client/util/IsoUtil.java @@ -1,5 +1,5 @@ // -// $Id: IsoUtil.java,v 1.9 2001/10/17 22:21:22 shaper Exp $ +// $Id: IsoUtil.java,v 1.10 2001/10/18 20:24:05 shaper Exp $ package com.threerings.miso.scene.util; @@ -451,15 +451,11 @@ public class IsoUtil bx -= (((ObjectTile)db.obj).baseWidth - 1); } - // Log.info("getOverlap [ax=" + ax + ", ay=" + ay + - // ", bx=" + bx + ", by=" + by + "]."); - - if (ax > bx && ay < by) { + if (ax < bx && ay > by) { // we most certainly don't overlap return 0; } - // calculate inequality constant for db's leftmost corner int k = (bx + by);