AndorsTrailRelease/archived-ATCS
1
0
Fork 0
mirror of https://github.com/AndorsTrailRelease/ATCS.git synced 2025-10-27 18:44:03 +01:00
Code Issues 1 Packages Projects Releases 5 Wiki Activity

Buf fixes for worldmaps upon contained map deletion.

Browse Source
This commit is contained in:
Zukero
2017-10-31 15:50:04 +01:00
parent cbc101b3b1
commit 1786860a3b
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/gpl/rpg/atcontentstudio/model/maps/WorldmapSegment.java
View File

@@ -29,7 +29,6 @@ import com.gpl.rpg.atcontentstudio.model.ProjectTreeNode;
import com.gpl.rpg.atcontentstudio.model.SaveEvent;
import com.gpl.rpg.atcontentstudio.model.gamedata.GameDataSet;
import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
import com.gpl.rpg.atcontentstudio.ui.StudioFrame;
public class WorldmapSegment extends GameDataElement {
@@ -114,12 +113,20 @@ public class WorldmapSegment extends GameDataElement {
mapLocations.remove(oldOne.id);
modified = true;
}
List<String> deprecatedLabels = new ArrayList<String>();
for (String label : labelledMaps.keySet()) {
if (labelledMaps.get(label).contains(oldOne.id)) {
labelledMaps.get(label).remove(oldOne.id);
modified = true;
if (labelledMaps.get(label).isEmpty()) {
deprecatedLabels.add(label);
}
}
}
for (String label : deprecatedLabels) {
labelledMaps.remove(label);
labels.remove(label);
}
}
oldOne.removeBacklink(this);

15
src/com/gpl/rpg/atcontentstudio/ui/map/WorldMapView.java
View File

@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.JComponent;
@@ -191,7 +190,7 @@ public class WorldMapView extends JComponent implements Scrollable {
FontMetrics mifm = g2.getFontMetrics();
int mapIdLabelHeight = mifm.getHeight();
for (String s : mapLocations.keySet()) {
for (String s : new HashSet<String>(mapLocations.keySet())) {
int x = mapLocations.get(s).x;
int y = mapLocations.get(s).y;
@@ -481,6 +480,10 @@ public class WorldMapView extends JComponent implements Scrollable {
offsetX = worldmap.segmentX * TILE_SIZE;
offsetY = worldmap.segmentY * TILE_SIZE;
for (String s : worldmap.mapLocations.keySet()) {
if (proj.getMap(s) == null) {
System.err.println("Warning. Worldmap "+worldmap.id+" references map "+s+" but it doesn't exist in this project");
continue;
}
int x = worldmap.mapLocations.get(s).x * TILE_SIZE;
int w = proj.getMap(s).tmxMap.getWidth() * TILE_SIZE;
int y = worldmap.mapLocations.get(s).y * TILE_SIZE;
@@ -497,6 +500,10 @@ public class WorldMapView extends JComponent implements Scrollable {
worldmap.segmentX = offsetX / TILE_SIZE;
worldmap.segmentY = offsetY / TILE_SIZE;
for (String id : worldmap.mapLocations.keySet()) {
if (worldmap.getProject().getMap(id) == null) {
System.err.println("Warning. Worldmap "+worldmap.id+" references map "+id+" but it doesn't exist in this project");
continue;
}
worldmap.getProject().getMap(id).removeBacklink(worldmap);
}
worldmap.mapLocations.clear();
@@ -508,6 +515,10 @@ public class WorldMapView extends JComponent implements Scrollable {
}
for (String id : worldmap.mapLocations.keySet()) {
if (worldmap.getProject().getMap(id) == null) {
System.err.println("Warning. Worldmap "+worldmap.id+" references map "+id+" but it doesn't exist in this project");
continue;
}
worldmap.getProject().getMap(id).addBacklink(worldmap);
}