Fix pax-britannica

Changed ArrayList to Array per changes in PR #573.

diff --git a/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Collision.java b/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Collision.java
index 0d5d17a..df5ce0a 100644 (file)
--- a/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Collision.java
+++ b/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Collision.java
@@ -36,7 +36,7 @@ public class Collision {
        private static void collisionCheck(Bullet bullet, Ship ship) {
                if (bullet.id!=ship.id && ship.alive) {
                        
-                       for(int i = 0; i<ship.collisionPoints.size();++i) {
+                       for(int i = 0; i<ship.collisionPoints.size;++i) {
                                if(Intersector.isPointInPolygon(bullet.collisionPoints, ship.collisionPoints.get(i))) {
                                        ship.damage(bullet.damage);
                                        GameInstance.getInstance().bulletHit(ship, bullet);
@@ -45,7 +45,7 @@ public class Collision {
                                }
                        }
                        
-                       for(int i = 0; i<bullet.collisionPoints.size();++i) {
+                       for(int i = 0; i<bullet.collisionPoints.size;++i) {
                                if(Intersector.isPointInPolygon(ship.collisionPoints, bullet.collisionPoints.get(i))) {
                                        ship.damage(bullet.damage);
                                        GameInstance.getInstance().bulletHit(ship, bullet);

diff --git a/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Ship.java b/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Ship.java
index 7775095..2a3d756 100644 (file)
--- a/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Ship.java
+++ b/demos/pax-britannica/pax-britannica/src/de/swagner/paxbritannica/Ship.java
@@ -7,6 +7,7 @@ import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.utils.Array;
 
 import de.swagner.paxbritannica.factory.FactoryProduction;
 
@@ -29,7 +30,7 @@ public class Ship extends Sprite {
        public Vector2 facing = new Vector2();
        
        public Vector2 collisionCenter = new Vector2();
-       public ArrayList<Vector2> collisionPoints = new ArrayList<Vector2>();
+       public Array<Vector2> collisionPoints = new Array<Vector2>();
 
        public boolean alive = true;