Undid last revision.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1454 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Ray Greenwell
2002-06-12 23:31:42 +00:00
parent 4623c07fc2
commit 4f2ca1dae9
@@ -1,5 +1,5 @@
// //
// $Id: TilePath.java,v 1.6 2002/06/12 07:01:29 ray Exp $ // $Id: TilePath.java,v 1.7 2002/06/12 23:31:42 ray Exp $
package com.threerings.miso.scene; package com.threerings.miso.scene;
@@ -50,9 +50,7 @@ public class TilePath extends LineSegmentPath
{ {
boolean moved = super.tick(pable, timestamp); boolean moved = super.tick(pable, timestamp);
if (moved && (_dest instanceof TilePathNode)) { if (moved) {
TilePathNode dest = (TilePathNode) _dest;
MisoCharacterSprite mcs = (MisoCharacterSprite)pable; MisoCharacterSprite mcs = (MisoCharacterSprite)pable;
int sx = mcs.getX(), sy = mcs.getY(); int sx = mcs.getX(), sy = mcs.getY();
Point pos = new Point(); Point pos = new Point();
@@ -65,7 +63,7 @@ public class TilePath extends LineSegmentPath
// if the sprite has reached the destination tile, // if the sprite has reached the destination tile,
// update the sprite's tile location and remember // update the sprite's tile location and remember
// we've arrived // we've arrived
int dtx = dest.getTileX(), dty = dest.getTileY(); int dtx = _dest.getTileX(), dty = _dest.getTileY();
if (pos.x == dtx && pos.y == dty) { if (pos.x == dtx && pos.y == dty) {
mcs.setTileLocation(dtx, dty); mcs.setTileLocation(dtx, dty);
// Log.info("Sprite arrived [dtx=" + dtx + // Log.info("Sprite arrived [dtx=" + dtx +
@@ -92,7 +90,7 @@ public class TilePath extends LineSegmentPath
protected PathNode getNextNode () protected PathNode getNextNode ()
{ {
// upgrade the path node to a tile path node // upgrade the path node to a tile path node
_dest = super.getNextNode(); _dest = (TilePathNode)super.getNextNode();
// note that we've not yet arrived at the destination tile // note that we've not yet arrived at the destination tile
_arrived = false; _arrived = false;
@@ -185,7 +183,7 @@ public class TilePath extends LineSegmentPath
protected boolean _arrived; protected boolean _arrived;
/** The destination tile path node. */ /** The destination tile path node. */
protected PathNode _dest; protected TilePathNode _dest;
/** The iso scene view model. */ /** The iso scene view model. */
protected IsoSceneViewModel _model; protected IsoSceneViewModel _model;