Changeset b97a618 in advance-wars for src/com/medievaltech/advancewars

Timestamp:

Feb 2, 2011, 4:51:03 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

78d3c6f

Parents:

6a639f7

Message:

Touching a unit now displays its movement area. Touching a square without a unit will stop displaying any previously displayed movement area. THe movement area is now drawn under the unit itself.

File:

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

src/com/medievaltech/advancewars/GameView.java

@@ -61 +61 @@
         private com.medievaltech.gui.Window wndMainMenu, wndBattleMap;
         private Unit selectedUnit;
-        private boolean test = false;
         
         public DrawingThread(SurfaceHolder surfaceHolder, Context context, Handler handler) {
@@ -111 +110 @@
             Tile oceanTile = new Tile(mTilePaint2);
             
-            mMap = new Map(grassTile, 6, 8);
+            mMap = new Map(grassTile, 6, 8, new Point(10, 25));
             
             boolean land = true;
@@ -127 +126 @@
             
             mMap.getTile(2, 3).addUnit(new Soldier(mUnitPaint));
-            mMap.getTile(5, 7).addUnit(new Soldier(mUnitPaint));
-            
-            selectedUnit = mMap.getTile(2, 3).currentUnit;
+            mMap.getTile(5, 6).addUnit(new Soldier(mUnitPaint));
             
             mGameState = GameState.MAIN_MENU;
@@ -350 +347 @@
                         mTextPaint.setTextSize(12);
                 
-                mMap.draw(canvas, 10, 25);
+                mMap.draw(canvas);
                 
-                for(Point p : selectedUnit.getMovementRange()) {
-                        canvas.drawRect(p.x*50+10, p.y*50+25, p.x*50+50+10, p.y*50+50+25, mSelectionPaint);
-                        if(!test)
-                                Log.i("AdvanceWars", "("+p.x+","+p.y+")");
+                if(selectedUnit != null) {
+                        for(Point p : selectedUnit.getMovementRange()) {
+                                canvas.drawRect(p.x*50+10, p.y*50+25, p.x*50+50+10, p.y*50+50+25, mSelectionPaint);
+                        }
                 }
-                test = true;
                 
-                text = "Advance Wars grid test";
-                canvas.drawText(text, 0, 450-(metrics.ascent+metrics.descent)/2, mTextPaint);
+                mMap.drawUnits(canvas);
+                
                         break;
                 }
@@ -432 +428 @@
                 case BATTLE_MAP:
                         Log.i("AdvanceWars", "Touch event detected on battle map");
-                        thread.mGameState = GameState.MAIN_MENU;
+                        
+                        if(event.getX() >= thread.mMap.offset.x && event.getY() >= thread.mMap.offset.y) {
+                                int x = ((int)event.getX() - thread.mMap.offset.x) / 50;
+                                int y = ((int)event.getY() - thread.mMap.offset.y) / 50;
+                                
+                                thread.selectedUnit = thread.mMap.getTile(x, y).currentUnit;
+                        }
+                        
                         break;
                 }