Changeset b97a618 in advance-wars

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.

Location:

src/com/medievaltech

Files:

• advancewars/GameView.java (modified) (5 diffs)
• game/Map.java (modified) (2 diffs)
• game/Tile.java (modified) (1 diff)
• game/Unit.java (modified) (2 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;
                 }

src/com/medievaltech/game/Map.java

@@ -6 +6 @@
 public class Map {
         private Tile[][] grid;
+        public Point offset;
         
-        public Map(int width, int height) {
+        public Map(int width, int height, Point offset) {
                 grid = new Tile[width][height];
+                this.offset = offset;
         }
         
-        public Map(Tile t, int width, int height) {
+        public Map(Tile t, int width, int height, Point offset) {
                 grid = new Tile[width][height];
+                this.offset = offset;
                 
                 for(int x=0; x<getWidth(); x++)
@@ -39 +42 @@
         }
         
-        public void draw(Canvas c, int xStart, int yStart) {
+        public void draw(Canvas c) {
                 for(int x=0; x<getWidth(); x++)
                         for(int y=0; y<getHeight(); y++)
-                                grid[x][y].draw(c, xStart+50*x, yStart+50*y);
+                                grid[x][y].draw(c, offset.x+50*x, offset.y+50*y);
+        }
+        
+        public void drawUnits(Canvas c) {
+                for(int x=0; x<getWidth(); x++)
+                        for(int y=0; y<getHeight(); y++)
+                                grid[x][y].drawUnit(c, offset.x+50*x, offset.y+50*y);
         }
 }

src/com/medievaltech/game/Tile.java

@@ -43 +43 @@
         public void draw(Canvas c, int x, int y) {
                 c.drawRect(x, y, x+50, y+50, p);
-                
+        }
+        
+        public void drawUnit(Canvas c, int x, int y) {
                 if(currentUnit != null)
                         currentUnit.draw(c, x+25, y+25);

src/com/medievaltech/game/Unit.java

@@ -60 +60 @@
                                         visited[p.x-location.x+move-1][p.y-location.y+move] = true;
                                 }
-                                if(p.x<8 && p.x<location.x+move && !visited[p.x-location.x+move+1][p.y-location.y+move]) {
+                                if(p.x<5 && p.x<location.x+move && !visited[p.x-location.x+move+1][p.y-location.y+move]) {
                                         cur.add(new Point(p.x+1, p.y));
                                         visited[p.x-location.x+move+1][p.y-location.y+move] = true;
@@ -68 +68 @@
                                         visited[p.x-location.x+move][p.y-location.y+move-1] = true;
                                 }
-                                if(p.y<6 && p.y<location.y+move && !visited[p.x-location.x+move][p.y-location.y+move+1]) {
+                                if(p.y<7 && p.y<location.y+move && !visited[p.x-location.x+move][p.y-location.y+move+1]) {
                                         cur.add(new Point(p.x, p.y+1));
                                         visited[p.x-location.x+move][p.y-location.y+move+1] = true;