Changeset 7f693b4 in advance-wars

Timestamp:

Jan 31, 2011, 1:36:01 AM (14 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

54e0965

Parents:

ece634d (diff), a0f5455 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 75ffb384ec7d8b4ad4fcbf491b318b55f8320342

Location:

src/com/example

Files:

• advancewars/Tile.java (modified) (1 diff)
• game/Soldier.java (added)
• game/Unit.java (added)

src/com/example/advancewars/Tile.java

@@ -1 +1 @@
 package com.example.advancewars;
 
-import com.example.gui.GUIObject;
+import com.example.game.Unit;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Point;
 
 public class Tile {
+        public enum TerrainType
+        {
+                LAND, SEA
+        }
+        
+        TerrainType type;
+        public double moveCoefficent;
+        public Unit currentUnit;
+        public Point point;
+        
+        public void addUnit(Unit unit)
+        {
+                currentUnit = unit;     
+        }
+        
+        public void removeUnit(Unit unit)
+        {
+                if(currentUnit != null)
+                {
+                        currentUnit = null;
+                }
+        
+        }
         private Paint p;