Changeset fea4b77 in advance-wars for src/com/medievaltech/advancewars/GameView.java

Timestamp:

Jun 6, 2011, 6:07:43 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

99433bb

Parents:

b660017

Message:

Implemented turn and support for computer-controller movement of units. Right now, the computer moves a specific unit down one square when its his turn.

File:

• src/com/medievaltech/advancewars/GameView.java (modified) (4 diffs)

src/com/medievaltech/advancewars/GameView.java

@@ -19 +19 @@
     class DrawingThread extends Thread {        
         public GameState mGameState;
-
-        /*
-         * Member (state) fields
-         */
-
+        
+        //maybe make this private and make an accessor for it
+        public Map mMap;
+        
+        public Tile grassTile, oceanTile;
+        
+        public Turn mTurn;
+        
+        //temporary variable to let the enemy control a specific unit
+        //ownership of units hasn't been implemented yet
+        public Unit enemyUnit;
+        
         private int mCanvasHeight = 1;
         private int mCanvasWidth = 1;
 
-        /** Paint to draw the lines on screen. */
-        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1, mTilePaint2, mSelectionPaint,
-                mUnitPaint;
-        
-        //maybe make this private and make an accessor for it
-        public Map mMap;
-        
-        public Tile grassTile, oceanTile;
+        private Paint mLinePaint, mTextPaint, mButtonPaint, mTilePaint1,
+                                mTilePaint2, mSelectionPaint, mUnitPaint;
 
         /** Indicate whether the surface has been created & is ready to draw */
@@ -105 +106 @@
             }
             
+            enemyUnit = new Soldier(mUnitPaint);
+            
+            mMap.getTile(0, 0).addUnit(enemyUnit);
             mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
             mMap.getTile(5, 6).addUnit(new Soldier(mUnitPaint));
+            
+            mTurn = Turn.YOUR_TURN;
             
             mGameState = GameState.MAIN_MENU;
@@ -129 +135 @@
                     c = mSurfaceHolder.lockCanvas(null);
                     synchronized(mSurfaceHolder) {
+                        doLogic();
                         doDraw(c);
                     }
@@ -169 +176 @@
                 Log.i("AdvanceWars", "width: "+mCanvasWidth+", height: "+mCanvasHeight);
             }
+        }
+        
+        private void doLogic() {
+                if(mTurn == Turn.YOUR_TURN)
+                        return;
+                
+                switch(mGameState) {
+                case BATTLE_MAP:
+                        int x = thread.enemyUnit.location.x;
+                        int y = thread.enemyUnit.location.y;
+                        thread.mMap.getTile(x, y).removeUnit();
+                                thread.mMap.getTile(x, y+1).addUnit(thread.enemyUnit);
+                        mTurn = Turn.YOUR_TURN;
+                        break;
+                }
         }