10 files changed, 79 insertions, 14 deletions

@@ -26,7 +26,7 @@ public enum AnimationType {
      */
     CommonWithStepping(true, true)
     {
-        Interval in = Interval.createTickInterval(2);
+        transient Interval in = Interval.createTickInterval(2);
         
         @Override
         public void tick(PossibleEvent pe)
@@ -56,7 +56,7 @@ public enum AnimationType {
      */
     TurnLeft(true, true)
     {
-        Interval in = Interval.createTickInterval(2);
+        transient Interval in = Interval.createTickInterval(2);
         
         @Override
         public void tick(PossibleEvent pe)
@@ -73,7 +73,7 @@ public enum AnimationType {
      */
     TurnRight(true, true)
     {
-        Interval in = Interval.createTickInterval(2);
+        transient Interval in = Interval.createTickInterval(2);
         
         @Override
         public void tick(PossibleEvent pe)
@@ -51,11 +51,13 @@ public class CommonEvent {
         this.callback = callback;
     }
 
-    public EventCallTime getCalltime() {
+    public EventCallTime getCalltime()
+    {
         return calltime;
     }
 
-    public void setCalltime(EventCallTime calltime) {
+    public void setCalltime(EventCallTime calltime)
+    {
         this.calltime = calltime;
     }
     
@@ -59,10 +59,10 @@ public class EventHandler {
                      * Also reset the viewpoint in case the viewpoint was
                      * fixed during the thread */
                     
-                    SpecialEvent.mapView.setViewpoint(new AutomaticViewpoint(SpecialEvent.mapView.getCurrentMap()));
+                    new SpecialEvent().ResetViewpoint();
                 } catch (ResourceNotFoundException ex)
                 {
-                    PuzzleApplication.INSTANCE.reportError(ex);
+                    PuzzleApplication.reportError(ex);
                 }
             }
         };
@@ -14,6 +14,8 @@ import java.util.Vector;
  */
 public class EventList extends Vector<LayerEvent> {
     
+    private static final long serialVersionUID = 765438545;
+    
     public EventList(Map parentMap)
     {
         setParentMap(parentMap);
@@ -62,7 +64,7 @@ public class EventList extends Vector<LayerEvent> {
         return super.add(o);
     }
     
-    private Map parentMap = null;
+    private transient Map parentMap = null;
     public Map getParentMap()
     {
         return parentMap;
@@ -77,4 +79,34 @@ public class EventList extends Vector<LayerEvent> {
         }
     }
 
+    @Override
+    public int hashCode()
+    {
+        int hash = 3;
+        hash = 59 * hash + (this.parentMap != null ? this.parentMap.hashCode() : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (obj == null)
+        {
+            return false;
+        }
+        
+        if (getClass() != obj.getClass())
+        {
+            return false;
+        }
+        
+        final EventList other = (EventList) obj;
+        if (this.parentMap != other.parentMap && (this.parentMap == null || !this.parentMap.equals(other.parentMap)))
+        {
+            return false;
+        }
+        
+        return true;
+    }
+
 }
@@ -14,12 +14,18 @@ import com.fourisland.fourpuzzle.database.GameCharacter;
 import com.fourisland.fourpuzzle.gamestate.mapview.Map;
 import com.fourisland.fourpuzzle.gamestate.mapview.MapViewGameState;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.graphic.BlankEventGraphic;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  *
  * @author hatkirby
  */
-public class HeroEvent extends AbstractEvent implements Event {
+public class HeroEvent extends AbstractEvent implements Event, Serializable {
+    
+    private static final long serialVersionUID = 402340890;
     
     public HeroEvent()
     {
@@ -73,5 +79,27 @@ public class HeroEvent extends AbstractEvent implements Event {
     {
         return ((MapViewGameState) Game.getGameState()).getCurrentMap();
     }
+    
+    /**
+     * Serialize this HeroEvent instance
+     * 
+     * When serializing a HeroEvent, the only information that is really
+     * necessary is the Hero's location and direction, because all other
+     * important information is serialized by SaveFile.
+     * 
+     * @serialData The Hero's location (as a Point object) is emitted, followed
+     * by the a Direction object representing the Hero's direction.
+     */
+    private void writeObject(ObjectOutputStream s) throws IOException
+    {
+        s.writeObject(getLocation());
+        s.writeObject(getDirection());
+    }
+    
+    private void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException
+    {
+        setLocation((Point) s.readObject());
+        setDirection((Direction) s.readObject());
+    }
 
 }
@@ -26,7 +26,7 @@ public final class ImmutableEvent
 
     public String getLabel()
     {
-        return new String(ev.getLabel());
+        return ev.getLabel();
     }
 
     public Point getLocation()
@@ -30,7 +30,7 @@ import java.util.concurrent.CountDownLatch;
  */
 public class SpecialEvent {
     
-    protected static MapViewGameState mapView = null;
+    private static MapViewGameState mapView = null;
     public static void setMapView(MapViewGameState mapView)
     {
         SpecialEvent.mapView = mapView;
@@ -7,6 +7,7 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event.movement;
 
 import com.fourisland.fourpuzzle.Direction;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.ImmutableEvent;
+import java.util.Arrays;
 
 /**
  * CustomMovementEvent takes an array of Directions and directions the event
@@ -22,7 +23,7 @@ public class CustomMovementType implements MovementType {
     
     public CustomMovementType(Direction[] moves)
     {
-        this.moves = moves;
+        this.moves = Arrays.copyOf(moves, moves.length);
     }
     
     public Direction nextMovement(ImmutableEvent ev)
@@ -7,6 +7,7 @@ package com.fourisland.fourpuzzle.gamestate.mapview.event.specialmove;
 
 import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
 import java.awt.Point;
+import java.util.Arrays;
 
 /**
  * LoopUntilCollisionMoveEvent takes an array of <b>MoveEvent</b>s and repeatedly
@@ -24,7 +25,7 @@ public class LoopUntilCollisionMoveEvent implements MoveEvent {
     
     public LoopUntilCollisionMoveEvent(MoveEvent[] moves)
     {
-        this.moves = moves;
+        this.moves = Arrays.copyOf(moves, moves.length);
     }
 
     public void doAction(Event ev)
@@ -9,6 +9,7 @@ import com.fourisland.fourpuzzle.Game;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.Event;
 import com.fourisland.fourpuzzle.gamestate.mapview.event.LayerEvent;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Vector;
 import java.util.concurrent.ExecutorService;
@@ -34,7 +35,7 @@ public class MoveEventThread implements Runnable {
     public MoveEventThread(Event ev, MoveEvent[] actions)
     {
         this.ev = ev;
-        this.actions = actions;
+        this.actions = Arrays.copyOf(actions, actions.length);
     }
     
     public void start()