Changeset dd3e793 in advance-wars

Timestamp:

Jan 30, 2011, 7:11:12 PM (14 years ago)

Author:

sdanshin <devnull@…>

Branches:

master

Children:

90838a1

Parents:

681c37d

Message:

Created a blank window where the main menu should be. Touching the screen shows the screen with the blue and green grid.

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 {
-        YOUR_TURN,
-        COMP_TURN
+        MAIN_MENU,
+        BATTLE_MAP
 }

src/com/example/advancewars/GameView.java

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