AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitespace

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@895 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Dave Hoover
2010-02-09 04:11:34 +00:00
parent 1dac539f6d
commit fcd8a9d901
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/puzzle/client/PuzzleBoardView.java
+2 -3
View File
@@ -310,7 +310,7 @@ public abstract class PuzzleBoardView extends VirtualMediaPanel
protected void renderBackground (Graphics2D gfx, Rectangle dirty) protected void renderBackground (Graphics2D gfx, Rectangle dirty)
{ {
gfx.setColor(getBackground()); gfx.setColor(getBackground());
gfx.fill(dirty); gfx.fill(dirty);
} }
@Override @Override
@@ -342,8 +342,7 @@ public abstract class PuzzleBoardView extends VirtualMediaPanel
protected void maybeFireCleared () protected void maybeFireCleared ()
{ {
if (DEBUG_ACTION) { if (DEBUG_ACTION) {
log.info("Maybe firing cleared " + log.info("Maybe firing cleared " + getActionCount() + ":" + isShowing());
getActionCount() + ":" + isShowing());
} }
if (getActionCount() == 0) { if (getActionCount() == 0) {
// we're probably in the middle of a tick() in an animationDidFinish() call and we want // we're probably in the middle of a tick() in an animationDidFinish() call and we want
src/java/com/threerings/puzzle/drop/client/DropBoardView.java
+7 -10
View File
@@ -110,7 +110,7 @@ public abstract class DropBoardView extends PuzzleBoardView
/** /**
* Called by the {@link DropSprite} to populate <code>pos</code> with the screen coordinates * Called by the {@link DropSprite} to populate <code>pos</code> with the screen coordinates
* in pixels at which a piece at <code>(col, row)</code> in the board should be drawn. Derived * in pixels at which a piece at <code>(col, row)</code> in the board should be drawn. Derived
* classes may wish to override this method to allow specialised positioning of sprites. * classes may wish to override this method to allow specialized positioning of sprites.
*/ */
public void getPiecePosition (int col, int row, Point pos) public void getPiecePosition (int col, int row, Point pos)
{ {
@@ -165,14 +165,13 @@ public abstract class DropBoardView extends PuzzleBoardView
public void updatePiece (int piece, int sx, int sy) public void updatePiece (int piece, int sx, int sy)
{ {
if (sx < 0 || sy < 0 || sx >= _bwid || sy >= _bhei) { if (sx < 0 || sy < 0 || sx >= _bwid || sy >= _bhei) {
log.warning("Requested to update piece in invalid location", "sx", sx, "sy", sy, log.warning("Requested to update piece in invalid location",
new Exception()); "sx", sx, "sy", sy, new Exception());
return; return;
} }
int spos = sy * _bwid + sx; int spos = sy * _bwid + sx;
if (_pieces[spos] != null) { if (_pieces[spos] != null) {
((ImageSprite)_pieces[spos]).setMirage( ((ImageSprite)_pieces[spos]).setMirage(getPieceImage(piece, sx, sy, NORTH));
getPieceImage(piece, sx, sy, NORTH));
} else { } else {
createPiece(piece, sx, sy); createPiece(piece, sx, sy);
} }
@@ -181,12 +180,11 @@ public abstract class DropBoardView extends PuzzleBoardView
/** /**
* Creates a new piece sprite and moves it into position on the board. * Creates a new piece sprite and moves it into position on the board.
*/ */
public void createPiece (int piece, int sx, int sy, int tx, int ty, public void createPiece (int piece, int sx, int sy, int tx, int ty, long duration)
long duration)
{ {
if (tx < 0 || ty < 0 || tx >= _bwid || ty >= _bhei) { if (tx < 0 || ty < 0 || tx >= _bwid || ty >= _bhei) {
log.warning("Requested to create and move piece to invalid location", log.warning("Requested to create and move piece to invalid location",
"tx", tx, "ty", ty, new Exception()); "tx", tx, "ty", ty, new Exception());
return; return;
} }
Sprite sprite = createPieceSprite(piece, sx, sy); Sprite sprite = createPieceSprite(piece, sx, sy);
@@ -414,8 +412,7 @@ public abstract class DropBoardView extends PuzzleBoardView
* @param color the color of the text. * @param color the color of the text.
* @param font the font. * @param font the font.
*/ */
public ScoreAnimation createScoreAnimation ( public ScoreAnimation createScoreAnimation (String score, Color color, Font font)
String score, Color color, Font font)
{ {
return createScoreAnimation(score, color, font, 0, _bhei - 1, _bwid, _bhei); return createScoreAnimation(score, color, font, 0, _bhei - 1, _bwid, _bhei);
} }