Changes in / [90838a1:c088db6] in advance-wars

Location:

src/com/example/advancewars

Files:

• Game.java (modified) (1 diff)
• GameState.java (modified) (1 diff)
• GameView.java (modified) (5 diffs)

src/com/example/advancewars/Game.java

@@ -53 +53 @@
                 break;
             case MENU_NEW:
+                if(mThread.mGameState == GameState.COMP_TURN)
+                        mGameView.newRound();
                 break;
         }

src/com/example/advancewars/GameState.java

@@ -2 +2 @@
 
 public enum GameState {
-        MAIN_MENU,
-        BATTLE_MAP
+        YOUR_TURN,
+        COMP_TURN
 }

src/com/example/advancewars/GameView.java

@@ -105 +105 @@
             }
             
-            mGameState = GameState.MAIN_MENU;
+            mGameState = GameState.YOUR_TURN;
         }
         
@@ -117 +117 @@
                 setState(AppState.RUNNING);
                 Log.i("Blackjack", "Player's turn starting now");
-                mGameState = GameState.MAIN_MENU;
+                mGameState = GameState.YOUR_TURN;
             }
         }
@@ -314 +314 @@
                 canvas.drawColor(Color.BLACK);
                 
-                String text;
+                mTextPaint.setTextSize(12);
                 Paint.FontMetrics metrics = mTextPaint.getFontMetrics();
                 
-                switch(mGameState) {
-                case MAIN_MENU:
-                        text = "Main Menu";
-                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
-                        break;
-                case BATTLE_MAP:
-                        mTextPaint.setTextSize(12);
-                
-                mMap.draw(canvas, 10, 25);
-                
-                text = "Advance Wars grid test";
-                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
-                        break;
-                }
+                mMap.draw(canvas, 10, 25);
+                
+                String text = "Advance Wars grid test";
+                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
         }
 
@@ -379 +369 @@
         setFocusable(true); // make sure we get key events
     }
+    
+    public void newRound() {        
+        thread.mGameState = GameState.YOUR_TURN;        
+    }
 
     @Override public boolean onTouchEvent(MotionEvent event) {
@@ -386 +380 @@
                 Log.i("Blackjack", "Detected UP touch action");
                 switch(thread.mGameState) {
-                case MAIN_MENU:
-                        Log.i("Blackjack", "Switching to battle map");
-                        thread.mGameState = GameState.BATTLE_MAP;
+                case YOUR_TURN:
+                        Log.i("Blackjack", "Player's turn");
                         break;
-                case BATTLE_MAP:
-                        Log.i("Blackjack", "Touch event detected on battle map");
+                case COMP_TURN:
+                        Log.i("Blackjack", "Computer's turn");
                         break;
                 }