Changeset c3ad11c in advance-wars for src/com/medievaltech/unit

Timestamp:

Aug 26, 2011, 9:54:05 PM (13 years ago)

Author:

dportnoy <devnull@…>

Branches:

master

Children:

511177b

Parents:

99433bb

Message:

Units are now colored based on the player that controls them. The controlling player is specified in the unit's constructor.

Location:

src/com/medievaltech/unit

Files:

• Artillery.java (modified) (2 diffs)
• Mech.java (modified) (2 diffs)
• Recon.java (modified) (2 diffs)
• SmTank.java (modified) (2 diffs)
• Soldier.java (modified) (2 diffs)
• Transport.java (modified) (1 diff)
• Unit.java (modified) (3 diffs)

src/com/medievaltech/unit/Artillery.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Artillery extends Unit{
-        public Artillery(Paint p) 
+        public Artillery(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Mech.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Mech extends Unit{
-        public Mech(Paint p) 
+        public Mech(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Recon.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Recon extends Unit{
-        public Recon(Paint p) 
+        public Recon(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/SmTank.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class SmTank extends Unit{
-        public SmTank(Paint p) 
+        public SmTank(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Soldier.java

@@ -3 +3 @@
 import java.util.List;
 
-import android.graphics.Paint;
 import android.graphics.Point;
 
@@ -9 +8 @@
 
 public class Soldier extends Unit{
-        public Soldier(Paint p) 
+        public Soldier(Player p) 
         {
                 super(p);

src/com/medievaltech/unit/Transport.java

@@ -1 +1 @@
 package com.medievaltech.unit;
-
-import android.graphics.Paint;
 
 public abstract class Transport extends Unit {
         public Unit storedUnit;
         
-        public Transport(Paint p) {
+        public Transport(Player p) {
                 super(p);
         }

src/com/medievaltech/unit/Unit.java

@@ -8 +8 @@
 
 public abstract class Unit {
-        private Paint p;
-        
         public UnitType type;
-        //public Player owner;
+        public Player owner;
         
         public int maxHealth;
@@ -26 +24 @@
         public Point location;
         
-        public Unit(Paint p) 
+        public Unit(Player p) 
         {
-                this.p = p;
+                p.addUnit(this);
+                
+                owner = p;
                 maxHealth = 10;
                 currentHealth = 10;
-                
         }
         
@@ -87 +86 @@
         
         public void draw(Canvas c, int x, int y) {
-                c.drawCircle(x, y, 20, p);
+                c.drawCircle(x, y, 20, owner.getColor());
         }
 }