Whitespace

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@1090 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Dave Hoover
2011-05-26 17:31:27 +00:00
parent be0fa3dd2e
commit d59010a276
4 changed files with 11 additions and 15 deletions
@@ -198,8 +198,7 @@ public abstract class GameController extends PlaceController
if (event.getName().equals(GameObject.STATE)) { if (event.getName().equals(GameObject.STATE)) {
int newState = event.getIntValue(); int newState = event.getIntValue();
if (!stateDidChange(newState)) { if (!stateDidChange(newState)) {
log.warning("Game transitioned to unknown state [gobj=" + _gobj + log.warning("Game transitioned to unknown state", "gobj", _gobj, "state", newState);
", state=" + newState + "].");
} }
} }
} }
@@ -28,8 +28,7 @@ import com.threerings.io.SimpleStreamableObject;
*/ */
public class GameAI extends SimpleStreamableObject public class GameAI extends SimpleStreamableObject
{ {
/** The "personality" of the AI, which can be interpreted by /** The "personality" of the AI, which can be interpreted by each puzzle. */
* each puzzle. */
public int personality; public int personality;
/** The skill level of the AI. */ /** The skill level of the AI. */
@@ -41,8 +40,7 @@ public class GameAI extends SimpleStreamableObject
} }
/** /**
* Constructs an AI with the specified (game-interpreted) skill and * Constructs an AI with the specified (game-interpreted) skill and personality.
* personality.
*/ */
public GameAI (int personality, int skill) public GameAI (int personality, int skill)
{ {
@@ -91,8 +91,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
{ {
// sanity check // sanity check
if (_turnIdx < 0 || _turnIdx >= _turnGame.getPlayers().length) { if (_turnIdx < 0 || _turnIdx >= _turnGame.getPlayers().length) {
log.warning("startTurn() called with invalid turn index [game=" + where() + log.warning("startTurn() called with invalid turn index", "game", where(),
", turnIdx=" + _turnIdx + "]."); "turnIdx", _turnIdx);
// abort, abort // abort, abort
return; return;
} }
@@ -223,8 +223,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
if (_turnIdx == oturnIdx) { if (_turnIdx == oturnIdx) {
// if we've wrapped all the way around, stop where we are even if the current // if we've wrapped all the way around, stop where we are even if the current
// player is not active. // player is not active.
log.warning("1 or less active players. Unable to properly change turn. " + log.warning("1 or less active players. Unable to properly change turn.",
"[game=" + where() + "]."); "game", where());
break; break;
} }
} while (!_tgmgr.isActivePlayer(_turnIdx)); } while (!_tgmgr.isActivePlayer(_turnIdx));
@@ -241,8 +241,8 @@ public class TurnGameManagerDelegate extends GameManagerDelegate
while (!_tgmgr.isActivePlayer(_turnIdx)) { while (!_tgmgr.isActivePlayer(_turnIdx)) {
_turnIdx = (_turnIdx + 1) % size; _turnIdx = (_turnIdx + 1) % size;
if (_turnIdx == firstPick) { if (_turnIdx == firstPick) {
log.warning("No players eligible for randomly-assigned turn. Choking. " + log.warning("No players eligible for randomly-assigned turn. Choking.",
"[game=" + where() + "]."); "game", where());
return; return;
} }
} }
@@ -332,7 +332,7 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
// if the sprite has made it to the bottom of the board then we don't want to allow it to // if the sprite has made it to the bottom of the board then we don't want to allow it to
// "virtually" fall any further because of the bounce interval // "virtually" fall any further because of the bounce interval
float pctdone = (row >= (_bhei - 1)) ? 0 : float pctdone = (row >= (_bhei - 1)) ? 0 :
_blocksprite.getPercentDone(_dview.getTimeStamp()); _blocksprite.getPercentDone(_dview.getTimeStamp());
// get the drop block position resulting from the move // get the drop block position resulting from the move
@@ -1140,8 +1140,7 @@ public abstract class DropControllerDelegate extends PuzzleControllerDelegate
}; };
/** A piece operation that will update piece sprites as board positions are updated. */ /** A piece operation that will update piece sprites as board positions are updated. */
protected DropBoard.PieceOperation _updateBoardOp = protected DropBoard.PieceOperation _updateBoardOp = new DropBoard.PieceOperation() {
new DropBoard.PieceOperation() {
public boolean execute (DropBoard board, int col, int row) { public boolean execute (DropBoard board, int col, int row) {
_dview.updatePiece(col, row); _dview.updatePiece(col, row);
return true; return true;