From 9199f4ccc7ee1e5f9c3bc48ada98cab8d223f295 Mon Sep 17 00:00:00 2001 From: Mike Thomas Date: Tue, 10 Aug 2010 22:55:20 +0000 Subject: [PATCH] This can handle any type of tileset it can get base sizes out of. git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@947 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../com/threerings/stage/util/StageSceneUtil.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/java/com/threerings/stage/util/StageSceneUtil.java b/src/java/com/threerings/stage/util/StageSceneUtil.java index b1f680f5..d1e66215 100644 --- a/src/java/com/threerings/stage/util/StageSceneUtil.java +++ b/src/java/com/threerings/stage/util/StageSceneUtil.java @@ -34,6 +34,7 @@ import com.samskivert.util.SortableArrayList; import com.threerings.util.DirectionCodes; import com.threerings.util.DirectionUtil; +import com.threerings.media.tile.BaseSizableTileSet; import com.threerings.media.tile.TileManager; import com.threerings.media.tile.TileUtil; import com.threerings.media.tile.TrimmedObjectTileSet; @@ -149,8 +150,7 @@ public class StageSceneUtil return new StageLocation(opos.x, opos.y, (byte)orient); } catch (Exception e) { - log.warning("Unable to look up object tile for scene object " + - "[tileId=" + tileId + ", error=" + e + "]."); + log.warning("Unable to look up object tile for scene object", "tileId", tileId, e); } return null; } @@ -201,8 +201,7 @@ public class StageSceneUtil try { int tsid = TileUtil.getTileSetId(tileId); int tidx = TileUtil.getTileIndex(tileId); - TrimmedObjectTileSet tset = (TrimmedObjectTileSet) - tilemgr.getTileSet(tsid); + BaseSizableTileSet tset = (BaseSizableTileSet)tilemgr.getTileSet(tsid); if (tset == null) { return false; } @@ -213,8 +212,7 @@ public class StageSceneUtil return true; } catch (Exception e) { - log.warning("Unable to look up object tile for scene object " + - "[tileId=" + tileId + ", error=" + e + "]."); + log.warning("Unable to look up object tile for scene object", "tileId", tileId, e); return false; } } @@ -237,8 +235,7 @@ public class StageSceneUtil return tset.getPassability()[tidx]; } catch (Exception e) { - log.warning("Unable to look up base tile [tileId=" + tileId + - ", error=" + e + "]."); + log.warning("Unable to look up base tile", "tileId", tileId, e); return true; } }