From 8397a783175297b9418c504dc1334b67d1aa7aa8 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 15 Sep 2004 18:48:09 +0000
Subject: [PATCH] Provide the board coordinates when creating piece images so
 that puzzles that care can do the right thing.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3119 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../puzzle/drop/client/DropBoardView.java      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java
index dbcca13b8..f81a90c7e 100644
--- a/src/java/com/threerings/puzzle/drop/client/DropBoardView.java
+++ b/src/java/com/threerings/puzzle/drop/client/DropBoardView.java
@@ -1,5 +1,5 @@
 //
-// $Id: DropBoardView.java,v 1.5 2004/08/29 06:50:47 mdb Exp $
+// $Id: DropBoardView.java,v 1.6 2004/09/15 18:48:09 mdb Exp $
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -194,9 +194,11 @@ public abstract class DropBoardView extends PuzzleBoardView
             Thread.dumpStack();
             return;
         }
-        Sprite sprite = createPieceSprite(piece);
-        addSprite(sprite);
-        movePiece(sprite, sx, sy, tx, ty, duration);
+        Sprite sprite = createPieceSprite(piece, sx, sy);
+        if (sprite != null) {
+            addSprite(sprite);
+            movePiece(sprite, sx, sy, tx, ty, duration);
+        }
     }
 
     /**
@@ -333,7 +335,8 @@ public abstract class DropBoardView extends PuzzleBoardView
         _pieces = new Sprite[width * height];
         for (int yy = 0; yy < height; yy++) {
             for (int xx = 0; xx < width; xx++) {
-                Sprite piece = createPieceSprite(_dboard.getPiece(xx, yy));
+                Sprite piece = createPieceSprite(
+                    _dboard.getPiece(xx, yy), xx, yy);
                 if (piece != null) {
                     int ppos = yy * width + xx;
                     getPiecePosition(xx, yy, spos);
@@ -488,12 +491,13 @@ public abstract class DropBoardView extends PuzzleBoardView
      * Creates the sprite that is used to display the specified piece. If
      * the piece represents no piece, this method should return null.
      */
-    protected Sprite createPieceSprite (int piece)
+    protected Sprite createPieceSprite (int piece, int px, int py)
     {
         if (piece == PIECE_NONE) {
             return null;
         }
-        ImageSprite sprite = new ImageSprite(getPieceImage(piece));
+        ImageSprite sprite = new ImageSprite(
+            getPieceImage(piece, px, py, NORTH));
         sprite.setRenderOrder(-1);
         return sprite;
     }