Changeset bdd63ba in advance-wars

Timestamp:

Jun 4, 2011, 6:55:31 PM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

379005b

Parents:

113d7cf

Message:

Clicking on a unit and then clicking on a tile in its range will move the unit there, provided there is no other unit currently on that tile.

Files:

• src/com/medievaltech/advancewars/GameView.java (modified) (1 diff)
• src/com/medievaltech/advancewars/Tile.java (modified) (1 diff)
• test.txt (deleted)

src/com/medievaltech/advancewars/GameView.java

@@ -464 +464 @@
                                 int y = ((int)event.getY() - thread.mMap.offset.y) / 50;
                                 
-                                thread.selectedUnit = thread.mMap.getTile(x, y).currentUnit;
+                                Unit target = thread.mMap.getTile(x, y).currentUnit;
+                                
+                                if(thread.selectedUnit != null && thread.selectedUnit.getMovementRange().contains(new Point(x, y))) {
+                                        if(target == null || target == thread.selectedUnit) {
+                                                        thread.mMap.getTile(thread.selectedUnit.location.x, thread.selectedUnit.location.y).removeUnit();
+                                                        thread.mMap.getTile(x, y).addUnit(thread.selectedUnit);
+                                        }else {
+                                                // the target contains another unit. If the unit is enemy-controlled, attack it
+                                        }
+                                        thread.selectedUnit = null;
+                                }else
+                                        thread.selectedUnit = target;
                         }
                         

src/com/medievaltech/advancewars/Tile.java

@@ -37 +37 @@
         }
         
-        public void removeUnit(Unit unit) {
+        public void removeUnit() {
                 if(currentUnit != null) {
                         currentUnit = null;