Mercurial > hg > ristipolku

changeset 41:a5fd4f74a767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some variables.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 19 Feb 2011 03:05:13 +0200
parents a69103644bf6
children 951a4d669af0
files game/Engine.java
diffstat 1 files changed, 17 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/game/Engine.java	Fri Feb 18 23:34:47 2011 +0200
+++ b/game/Engine.java	Sat Feb 19 03:05:13 2011 +0200
@@ -116,10 +116,10 @@
     public static final int boardSize = 9;
     public static final int boardMiddle = 4;
     Piece[][] board;
-    Piece current;
     public boolean flagGameOver;
     
-    int moveX, moveY, movePoint;
+    Piece currPiece;
+    int currX, currY, currPoint;
 
     public GameBoard()
     {
@@ -127,9 +127,9 @@
 
         board[boardMiddle][boardMiddle] = new Piece(PieceType.START);
 
-        moveX = boardMiddle;
-        moveY = boardMiddle - 1;
-        movePoint = 5;
+        currX = boardMiddle;
+        currY = boardMiddle - 1;
+        currPoint = 5;
         
         pieceFinishTurn();        
         
@@ -171,8 +171,8 @@
 
     public void pieceRotate(Piece.RotateDir dir)
     {
-        if (current != null)
-            current.rotate(dir);
+        if (currPiece != null)
+            currPiece.rotate(dir);
     }
 
     public PathInfo resolvePath(int startX, int startY, int startPoint, boolean mark)
@@ -235,36 +235,36 @@
     public void pieceFinishTurn()
     {
         // Do we have a piece?
-        if (current != null)
+        if (currPiece != null)
         {
             // Yes, start resolving path to next piece placement
-            PathInfo i = resolvePath(moveX, moveY, movePoint, true);
+            PathInfo i = resolvePath(currX, currY, currPoint, true);
 
             if (i != null)
             {
-                moveX = i.outX;
-                moveY = i.outY;
-                movePoint = i.out;
+                currX = i.outX;
+                currY = i.outY;
+                currPoint = i.out;
             }
         }
 
         // Create a new piece
-        current = new Piece(PieceType.ACTIVE);
+        currPiece = new Piece(PieceType.ACTIVE);
 
         // Find a place for it
-        if (isEmpty(moveX, moveY))
+        if (isEmpty(currX, currY))
         {
             // Current position is empty, use it
-            board[moveX][moveY] = current;
+            board[currX][currY] = currPiece;
         }
         else
         {
             // Resolve path
-            PathInfo i = resolvePath(moveX, moveY, movePoint, true);
+            PathInfo i = resolvePath(currX, currY, currPoint, true);
             if (i != null)
             {
                 // Path found, place the piece
-                board[moveX][moveY] = current;
+                board[currX][currY] = currPiece;
             }
             else
             {