From ab2c64770d48f282c6cb8b7ee6cde0d28e6fe320 Mon Sep 17 00:00:00 2001 From: iobyte Date: Wed, 21 Feb 2024 17:50:36 +0000 Subject: [PATCH] trackeditor: don't run trackgen when there are duplicate object names git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9333 30fe4595-0a0c-4342-8851-515496e4dcbd --- src/tools/trackeditor/gui/EditorFrame.java | 14 ++++++++++++++ src/tools/trackeditor/utils/Properties.java | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/tools/trackeditor/gui/EditorFrame.java b/src/tools/trackeditor/gui/EditorFrame.java index dfeebc938..5f342bb9d 100644 --- a/src/tools/trackeditor/gui/EditorFrame.java +++ b/src/tools/trackeditor/gui/EditorFrame.java @@ -2347,6 +2347,20 @@ public class EditorFrame extends JFrame private void exportAc3d(String additionalArgs) { + //check for graphic objects with same name + Vector graphicObjects = trackData.getGraphicObjects(); + for (int i = 0; i < graphicObjects.size() - 1; i++) + { + for (int j = i + 1; j < graphicObjects.size(); j++) + { + if (graphicObjects.get(i).getName().equals(graphicObjects.get(j).getName())) + { + JOptionPane.showMessageDialog(this, "Graphic Objects has duplicate name: " + graphicObjects.get(i).getName(), "Exporting AC3", JOptionPane.ERROR_MESSAGE); + return; + } + } + } + String reliefBorder = getTrackData().getGraphic().getTerrainGeneration().getReliefBorder(); String newArgs = additionalArgs; if (reliefBorder != null && reliefBorder.equals("yes")) diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 679e1b91a..914959873 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.4.51"; + public final String version = "1.4.52"; private String path; private double imageScale = 1;