From 1bd4668067aae77a3d84b3590a4f84665fdf07dd Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 17 Feb 2002 07:30:45 +0000 Subject: [PATCH] Minor code cleanup; didn't turn out to be useful to have the object action in the object metrics record. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1006 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/miso/client/IsoSceneView.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/java/com/threerings/miso/client/IsoSceneView.java b/src/java/com/threerings/miso/client/IsoSceneView.java index 82ffc2ffc..211b273d7 100644 --- a/src/java/com/threerings/miso/client/IsoSceneView.java +++ b/src/java/com/threerings/miso/client/IsoSceneView.java @@ -1,5 +1,5 @@ // -// $Id: IsoSceneView.java,v 1.93 2002/02/17 07:16:21 mdb Exp $ +// $Id: IsoSceneView.java,v 1.94 2002/02/17 07:30:45 mdb Exp $ package com.threerings.miso.scene; @@ -184,12 +184,11 @@ public class IsoSceneView implements SceneView if (_hobject instanceof ObjectTile) { // if we're only highlighting objects with actions, make sure // this one has an action - if (_hmode != HIGHLIGHT_WITH_ACTION || - !StringUtil.blank(_scene.getObjectAction( - _hcoords.x, _hcoords.y))) { + String action = _scene.getObjectAction(_hcoords.x, _hcoords.y); + if (_hmode != HIGHLIGHT_WITH_ACTION || !StringUtil.blank(action)) { + Polygon tpoly = getTilePoly(_hcoords.x, _hcoords.y); hpoly = IsoUtil.getObjectFootprint( - _model, getTilePoly(_hcoords.x, _hcoords.y), - (ObjectTile)_hobject); + _model, tpoly, (ObjectTile)_hobject); } } @@ -381,7 +380,6 @@ public class IsoSceneView implements SceneView metrics.tile = tile; metrics.x = xx; metrics.y = yy; - metrics.action = _scene.getObjectAction(xx, yy); metrics.bounds = IsoUtil.getObjectBounds( _model, getTilePoly(xx, yy), tile); @@ -835,10 +833,6 @@ public class IsoSceneView implements SceneView /** The object's bounding polygon. */ public Polygon bounds; - - /** The action associated with the object or null if no action is - * associated. */ - public String action; } /** The sprite manager. */