Engine: Atomicized Maps

Previously, MapViewGameState preformed all of its actions directly on the internal map. However, this would result in the map being exactly the same when reloaded, which was not wanted. So, copy() functions have been added to several places so a copy of the internal map is provided for MapViewGameState.

5 files changed, 57 insertions, 1 deletions

@@ -128,7 +128,7 @@ public class Database {
     
     public static Map getMap(String key)
     {
-        return maps.get(key);
+        return maps.get(key).copy();
     }
 
 }
@@ -63,6 +63,22 @@ public class Map {
         setMusicType(musicType);
     }
     
+    public Map copy()
+    {
+        Map temp;
+        if (getMusicType() == MapMusicType.Specified)
+        {
+            temp = new Map(getSize().width, getSize().height, getChipSet(), getMusic());
+        } else {
+            temp = new Map(getSize().width, getSize().height, getChipSet(), getMusicType());
+        }
+        
+        temp.mapData = new Vector<HashMap<Integer,Integer>>(getMapData());
+        temp.events = getEvents().copy(this);
+        
+        return temp;
+    }
+    
     private Dimension size;
     public Dimension getSize()
     {
@@ -19,6 +19,18 @@ public class EventList extends Vector<LayerEvent> {
         setParentMap(parentMap);
     }
     
+    public EventList copy(Map parentMap)
+    {
+        EventList temp = new EventList(parentMap);
+        
+        for (LayerEvent ev : this)
+        {
+            temp.add(ev.copy());
+        }
+        
+        return temp;
+    }
+    
     @Override
     public boolean add(LayerEvent o)
     {
@@ -45,6 +45,18 @@ public class LayerEvent extends AbstractEvent implements Event {
         this.label = label;
     }
     
+    public LayerEvent copy()
+    {
+        LayerEvent temp = new LayerEvent(getLocation().x, getLocation().y, getLabel());
+        
+        for (PossibleEvent pe : events)
+        {
+            temp.addEvent(pe.copy());
+        }
+        
+        return temp;
+    }
+    
     private String label;
     public String getLabel()
     {
@@ -96,6 +96,22 @@ public class PossibleEvent {
         calltime = builder.calltime;
         callback = builder.callback;
     }
+    
+    public PossibleEvent copy()
+    {
+        PossibleEvent temp =  new Builder()
+                .graphic(graphic)
+                .layer(layer)
+                .animation(animation)
+                .movement(movement)
+                .calltime(calltime)
+                .callback(callback)
+                .build();
+        
+        temp.getPreconditions().addAll(preconditions);
+        
+        return temp;
+    }
 
     public EventGraphic getGraphic()
     {