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

Timestamp:

Jun 6, 2011, 6:07:43 PM (13 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/Game.java (modified) (3 diffs)

src/com/medievaltech/advancewars/Game.java

@@ -15 +15 @@
 
 public class Game extends Activity {
-        private static final int MENU_SAVE = 1;
-        private static final int MENU_MAIN = 2;
-    private static final int MENU_EXIT = 3;
-
-    /** A handle to the thread that's actually running the animation. */
     public DrawingThread mThread;
-
-    /** A handle to the View in which the game is running. */
     private GameView mGameView;
     
@@ -35 +28 @@
         super.onCreateOptionsMenu(menu);
 
-        menu.add(0, MENU_SAVE, 0, R.string.menu_save);
-        menu.add(0, MENU_MAIN, 0, R.string.menu_main);
-        menu.add(0, MENU_EXIT, 0, R.string.menu_exit);
+        menu.add(0, MenuOption.END_TURN.ordinal(), 0, R.string.menu_end_turn);
+        menu.add(0, MenuOption.SAVE.ordinal(), 0, R.string.menu_save);
+        menu.add(0, MenuOption.MAIN.ordinal(), 0, R.string.menu_main);
+        menu.add(0, MenuOption.EXIT.ordinal(), 0, R.string.menu_exit);
         return true;
     }
@@ -50 +44 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-                case MENU_SAVE:
-                        try {
-                                PrintWriter p = new PrintWriter(new FileWriter(android.os.Environment.getExternalStorageDirectory()+"/save.txt"));
-                                mThread.mMap.save(p);
-                                p.close();
-                        }catch(IOException ioe) {
-                                ioe.printStackTrace();
-                        }
-                        break;
-                case MENU_MAIN:
-                        mThread.mGameState = GameState.MAIN_MENU;
-                        break;
-            case MENU_EXIT:
-                finish();
-                break;
+        int i = item.getItemId();
+        
+        if(i == MenuOption.END_TURN.ordinal()) {
+                mThread.mTurn = Turn.ENEMY_TURN;
+        }else if(i == MenuOption.SAVE.ordinal()) {
+                try {
+                        PrintWriter p = new PrintWriter(new FileWriter(android.os.Environment.getExternalStorageDirectory()+"/save.txt"));
+                        mThread.mMap.save(p);
+                        p.close();
+                }catch(IOException ioe) {
+                        ioe.printStackTrace();
+                }
+        }else if(i == MenuOption.MAIN.ordinal()) {
+                mThread.mGameState = GameState.MAIN_MENU;
+        }else if(i == MenuOption.EXIT.ordinal()) {
+                finish();
         }