sigonasr2/RabiClone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make sure maps get copied over upon transition. Only one instance of map needed.

Browse Source 
Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2, Sig, Sigo 2022-06-13 16:06:58 +00:00 committed by GitHub
parent 3f92046a1f
commit 17de1993ca
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sig/map/Map.java
View File

@ -50,13 +50,17 @@ public class Map {
try {
if (RabiClone.CURRENT_MAP!=null) {
if (RabiClone.CURRENT_MAP!=map) {
resetMapData(RabiClone.CURRENT_MAP.getMap());
Map currentMapData = RabiClone.CURRENT_MAP.getMap();
resetMapData(currentMapData);
RabiClone.CURRENT_MAP=map;
RabiClone.CURRENT_MAP.setMap(currentMapData);
} else {
resetAndReloadEventData(RabiClone.CURRENT_MAP);
return RabiClone.CURRENT_MAP.getMap();
}
} else {
map.initializeMap();
}
RabiClone.CURRENT_MAP=map;
Map newMap = RabiClone.CURRENT_MAP.getMap()!=null?RabiClone.CURRENT_MAP.getMap():new Map();
DataInputStream stream = new DataInputStream(new FileInputStream(map.getFile()));
int marker=0;

8
src/sig/map/Maps.java
View File

@ -24,6 +24,14 @@ public enum Maps {
return map;
}
public void initializeMap() {
map = new Map();
}
public void setMap(Map m) {
this.map=m;
}
public void ModifyTile(int x,int y,Tile t) {
map.ModifyTile(x, y, t);
//System.out.println("Tile "+(y*MAP_WIDTH+x)+" is now "+tiles[y*MAP_WIDTH+x]+".");