From a581d9b4136bb633771e5e881bbee5a36247b0e0 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sat, 24 Jan 2009 14:37:02 -0500
Subject: Extended GameCharacters from ArrayList

---
 src/com/fourisland/fourpuzzle/Audio.java           |  3 +-
 src/com/fourisland/fourpuzzle/GameCharacters.java  | 48 +++++++++-------------
 src/com/fourisland/fourpuzzle/SaveFile.java        |  2 +-
 .../fourpuzzle/gamestate/mapview/Map.java          | 31 +++++++-------
 4 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/src/com/fourisland/fourpuzzle/Audio.java b/src/com/fourisland/fourpuzzle/Audio.java
index 99d4207..39ce3d8 100644
--- a/src/com/fourisland/fourpuzzle/Audio.java
+++ b/src/com/fourisland/fourpuzzle/Audio.java
@@ -8,7 +8,6 @@ package com.fourisland.fourpuzzle;
 import com.fourisland.fourpuzzle.util.ObjectLoader;
 import javax.sound.midi.MidiSystem;
 import javax.sound.midi.Sequencer;
-import javax.sound.midi.Track;
 
 /**
  *
@@ -46,7 +45,7 @@ public class Audio {
     }
     
     public static void playMusic(String file, boolean loop, float speed) throws Exception
-    {   
+    {
         seq.setSequence(ObjectLoader.getMusic(file));
 
         if (loop)
diff --git a/src/com/fourisland/fourpuzzle/GameCharacters.java b/src/com/fourisland/fourpuzzle/GameCharacters.java
index ef945c5..2a3b050 100644
--- a/src/com/fourisland/fourpuzzle/GameCharacters.java
+++ b/src/com/fourisland/fourpuzzle/GameCharacters.java
@@ -12,45 +12,42 @@ import java.util.ArrayList;
  *
  * @author hatkirby
  */
-public class GameCharacters implements Cloneable {
+public class GameCharacters extends ArrayList<GameCharacter>
+{
+    private GameCharacters() {}
     
-    private GameCharacters()
+    private static GameCharacters INSTANCE = new GameCharacters();
+    public static GameCharacters getDefaultParty()
     {
+        return INSTANCE;
     }
-    
-    public static GameCharacters INSTANCE = new GameCharacters();
 
-    public void add(GameCharacter e)
+    public static GameCharacters createParty()
     {
-        characters.add(e);
+        GameCharacters temp = new GameCharacters();
+        temp.addAll(INSTANCE);
+        
+        return temp;
     }
 
     public GameCharacter getLeader() throws Exception
     {
-        int i = 0;
-        for (i=0;i<characters.size();i++)
+        for (GameCharacter chara : this)
         {
-            if (characters.get(i).isInParty())
+            if (chara.isInParty())
             {
-                return characters.get(i);
+                return chara;
             }
         }
         
         Game.setGameState(new GameOverGameState());
-        throw new NoCharactersInPartyException();
-    }
-    public GameCharacters newInstance() throws CloneNotSupportedException
-    {
-        return (GameCharacters) clone();
+        return null;
     }
-
-    private ArrayList<GameCharacter> characters = new ArrayList<GameCharacter>();
     
     public boolean exists(String heroName) {
-        int i=0;
-        for (i=0;i<characters.size();i++)
+        for (GameCharacter chara : this)
         {
-            if (characters.get(i).getName().equals(heroName))
+            if (chara.getName().equals(heroName))
             {
                 return true;
             }
@@ -59,17 +56,12 @@ public class GameCharacters implements Cloneable {
         return false;
     }
 
-    public GameCharacter get(Integer get) {
-        return characters.get(get);
-    }
-
     public GameCharacter get(String heroName) throws NullPointerException {
-        int i=0;
-        for (i=0;i<characters.size();i++)
+        for (GameCharacter chara : this)
         {
-            if (characters.get(i).getName().equals(heroName))
+            if (chara.getName().equals(heroName))
             {
-                return characters.get(i);
+                return chara;
             }
         }
         
diff --git a/src/com/fourisland/fourpuzzle/SaveFile.java b/src/com/fourisland/fourpuzzle/SaveFile.java
index b4f2d68..27a5662 100644
--- a/src/com/fourisland/fourpuzzle/SaveFile.java
+++ b/src/com/fourisland/fourpuzzle/SaveFile.java
@@ -26,7 +26,7 @@ public class SaveFile implements Serializable {
     public SaveFile() throws CloneNotSupportedException
     {
         switches = new HashMap<String, Boolean>();
-        party = GameCharacters.INSTANCE.newInstance();
+        party = GameCharacters.createParty();
         variables = new HashMap<String, Integer>();
         currentMap = new String();
         hero = new HeroEvent();
diff --git a/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java b/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java
index b17d7b3..3df55dd 100644
--- a/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java
+++ b/src/com/fourisland/fourpuzzle/gamestate/mapview/Map.java
@@ -75,27 +75,26 @@ public abstract class Map {
             return true;
         }
         
-        int i=0;
-        for (i=0;i<events.size();i++)
+        for (LayerEvent ev : events)
         {
-            if (events.get(i).getLayer() == Layer.Middle)
+            if (ev.getLayer() == Layer.Middle)
             {
-                if ((events.get(i).getLocation().y == (y - 1)) && (events.get(i).getLocation().x == x) && (toMove == Direction.North))
+                if ((ev.getLocation().y == (y - 1)) && (ev.getLocation().x == x) && (toMove == Direction.North))
                 {
                     return true;
                 }
                 
-                if ((events.get(i).getLocation().x == (x - 1)) && (events.get(i).getLocation().y == y) && (toMove == Direction.West))
+                if ((ev.getLocation().x == (x - 1)) && (ev.getLocation().y == y) && (toMove == Direction.West))
                 {
                     return true;
                 }
                 
-                if ((events.get(i).getLocation().y == (y + 1)) && (events.get(i).getLocation().x == x) && (toMove == Direction.South))
+                if ((ev.getLocation().y == (y + 1)) && (ev.getLocation().x == x) && (toMove == Direction.South))
                 {
                     return true;
                 }
                 
-                if ((events.get(i).getLocation().x == (x + 1)) && (events.get(i).getLocation().y == y) && (toMove == Direction.East))
+                if ((ev.getLocation().x == (x + 1)) && (ev.getLocation().y == y) && (toMove == Direction.East))
                 {
                     return true;
                 }
@@ -124,32 +123,32 @@ public abstract class Map {
         
         ChipSet cSI = ChipSet.getChipSet(chipSet);
         HashMap<Integer,ChipSetData> cSID = cSI.getChipSetData();
-        for (i=0;i<getMapData().size();i++)
+        for (HashMap<Integer,Integer> mapArea : getMapData())
         {
-            if ((toMove == Direction.North) && (!cSID.get(mapData.get(i).get(x+((y-1)*getSize().width))).isEnableSouth()))
+            if ((toMove == Direction.North) && (!cSID.get(mapArea.get(x+((y-1)*getSize().width))).isEnableSouth()))
             {
                 return true;
-            } else if ((toMove == Direction.West) && (!cSID.get(mapData.get(i).get(x-1+(y*getSize().width))).isEnableEast()))
+            } else if ((toMove == Direction.West) && (!cSID.get(mapArea.get(x-1+(y*getSize().width))).isEnableEast()))
             {
                 return true;
-            } else if ((toMove == Direction.South) && (!cSID.get(mapData.get(i).get(x+((y+1)*getSize().width))).isEnableNorth()))
+            } else if ((toMove == Direction.South) && (!cSID.get(mapArea.get(x+((y+1)*getSize().width))).isEnableNorth()))
             {
                 return true;
-            } else if ((toMove == Direction.East) && (!cSID.get(mapData.get(i).get(x+1+(y*getSize().width))).isEnableWest()))
+            } else if ((toMove == Direction.East) && (!cSID.get(mapArea.get(x+1+(y*getSize().width))).isEnableWest()))
             {
                 return true;
             }
 
-            if ((toMove == Direction.North) && (!cSID.get(mapData.get(i).get(x+(y*getSize().width))).isEnableNorth()))
+            if ((toMove == Direction.North) && (!cSID.get(mapArea.get(x+(y*getSize().width))).isEnableNorth()))
             {
                 return true;
-            } else if ((toMove == Direction.West) && (!cSID.get(mapData.get(i).get(x+(y*getSize().width))).isEnableWest()))
+            } else if ((toMove == Direction.West) && (!cSID.get(mapArea.get(x+(y*getSize().width))).isEnableWest()))
             {
                 return true;
-            } else if ((toMove == Direction.South) && (!cSID.get(mapData.get(i).get(x+(y*getSize().width))).isEnableSouth()))
+            } else if ((toMove == Direction.South) && (!cSID.get(mapArea.get(x+(y*getSize().width))).isEnableSouth()))
             {
                 return true;
-            } else if ((toMove == Direction.East) && (!cSID.get(mapData.get(i).get(x+(y*getSize().width))).isEnableEast()))
+            } else if ((toMove == Direction.East) && (!cSID.get(mapArea.get(x+(y*getSize().width))).isEnableEast()))
             {
                 return true;
             }    
-- 
cgit 1.4.1