Changeset bb2fa26 in advance-wars

Timestamp:

Jan 19, 2015, 10:25:28 PM (10 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Parents:

4666fae

Message:

Add a menu for in-game actions.

Files:

• res/layout/main.xml (modified) (1 diff)
• res/menu/map_menu.xml (added)
• res/values/strings.xml (modified) (1 diff)
• src/com/medievaltech/advancewars/Game.java (modified) (3 diffs)
• src/com/medievaltech/advancewars/GameView.java (modified) (4 diffs)

res/layout/main.xml

@@ -3 +3 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
-        <com.medievaltech.advancewars.GameView android:id="@+id/lunar"
+        <com.medievaltech.advancewars.GameView android:id="@+id/main_view"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" /> 

res/values/strings.xml

@@ -7 +7 @@
     <string name="menu_main">Main Menu</string>
     <string name="menu_exit">Exit</string>
+    <string name="unit_menu_attack">Attack</string>
+    <string name="unit_menu_move">Move</string>
+    <string name="unit_menu_cancel">Cancel</string>
 </resources>

src/com/medievaltech/advancewars/Game.java

@@ -6 +6 @@
 import android.os.Bundle;
 import android.util.Log;
+import android.view.ContextMenu;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Window;
 
@@ -77 +81 @@
         // turn off the window's title bar
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-
+        
         // tell system to use the layout defined in our XML file
         setContentView(R.layout.main);
-
+        
+        /*View v = findViewById(R.id.main_view);
+        Log.i("AdvanceWars", "view is null?: " + (v==null));*/
+        
         Static.game = this;
 
@@ -90 +97 @@
             Static.gameState = (GameState)savedInstanceState.getSerializable("gameState");
         }
+    }
+    
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v,
+                                    ContextMenuInfo menuInfo) {
+      super.onCreateContextMenu(menu, v, menuInfo);
+      MenuInflater inflater = getMenuInflater();
+      inflater.inflate(R.menu.map_menu, menu);
     }
 

src/com/medievaltech/advancewars/GameView.java

@@ -12 +12 @@
 import android.os.*;
 import android.view.*;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -209 +210 @@
         }
     }
-
-    /** Pointer to the text view to display "Paused.." etc. */
-    //private TextView mStatusText;
-
+    
     public GameView(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -233 +231 @@
                 switch(Static.gameState) {
                 case MAIN_MENU:
-                        Log.i("AdvanceWars", "Switching to battle map");
                         if(Static.wndMainMenu.getGUIObject("btnNewGame").isClicked(event.getX(), event.getY())) {
+                                Log.i("AdvanceWars", "Switching to battle map");
                                 Static.gameState = GameState.BATTLE_MAP;
                         }else if(Static.wndMainMenu.getGUIObject("btnLoadGame").isClicked(event.getX(), event.getY())) {
@@ -293 +291 @@
                                 int y = ((int)event.getY() - Static.map.offset.y) / 50;
                                 
+                                Log.i("AdvanceWars", "About to show context menu");
+                                showContextMenu();
+                                
+                                /*
+                                
                                 Unit target = Static.map.getTile(x, y).currentUnit;
                                 
                                 if(Static.thread.selectedUnit != null && Static.thread.selectedUnit.getMovementRange().contains(new Point(x, y))) {
+                                        //Display a menu allowing the player to move to the target or attack the target or
+                                        //get more info on the target
+                                        
                                         if(target == null || target == Static.thread.selectedUnit) {
                                                         Static.map.getTile(Static.thread.selectedUnit.location.x, Static.thread.selectedUnit.location.y).removeUnit();
                                                         Static.map.getTile(x, y).addUnit(Static.thread.selectedUnit);
                                         }else {
-                                                // the target contains another unit. If the unit is enemy-controlled, attack it
+                                                // Display a context menu that gives the option of attacking the target
                                         }
                                         Static.thread.selectedUnit = null;
                                 }else
                                         Static.thread.selectedUnit = target;
+                                */
                         }