From f63458c0c81315e6958af31b74c04ca2e6dae962 Mon Sep 17 00:00:00 2001 From: iobyte Date: Tue, 23 Apr 2024 23:27:12 +0000 Subject: [PATCH] trackeditor: use csr-trackgen when csr preference selected git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9407 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: f020211ea521f21a8e8e90c9bc884335f0231352 Former-commit-id: 793b798608d552e9b0126c160df04121ebf6b2a1 --- src/tools/trackeditor/gui/DeltaPanel.java | 2 +- src/tools/trackeditor/gui/EditorFrame.java | 3 ++- src/tools/trackeditor/gui/TrackgenPanel.java | 2 +- src/tools/trackeditor/utils/Properties.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tools/trackeditor/gui/DeltaPanel.java b/src/tools/trackeditor/gui/DeltaPanel.java index fb7759672..fad32076e 100644 --- a/src/tools/trackeditor/gui/DeltaPanel.java +++ b/src/tools/trackeditor/gui/DeltaPanel.java @@ -124,7 +124,7 @@ public class DeltaPanel extends JDialog implements Runnable try { String ls_str; String tmp = ""; - String trackgen = "sd2-trackgen"; + String trackgen = editorFrame.getCarsSportsRacing() ? "csr-trackgen" : "sd2-trackgen"; if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty()) { trackgen = editorFrame.getBinDirectory() + sep + trackgen; } diff --git a/src/tools/trackeditor/gui/EditorFrame.java b/src/tools/trackeditor/gui/EditorFrame.java index 3ed9f8b6c..d286509c6 100644 --- a/src/tools/trackeditor/gui/EditorFrame.java +++ b/src/tools/trackeditor/gui/EditorFrame.java @@ -402,7 +402,8 @@ public class EditorFrame extends JFrame "load the default surfaces, textures and objects.\n" + "Make sure you have write permission if you intend to edit or add\n" + "tracks in this directory.\n\n" + - "You may need to specify the bin directory where sd2-trackgen is\n" + + "You may need to specify the bin directory where " + + (getCarsSportsRacing() ? "csr-trackgen" : "sd2-trackgen") + " is\n" + "located if it is not in your executable path.", "First Time Setup", JOptionPane.INFORMATION_MESSAGE); diff --git a/src/tools/trackeditor/gui/TrackgenPanel.java b/src/tools/trackeditor/gui/TrackgenPanel.java index e7bd1efef..1b0969ce4 100644 --- a/src/tools/trackeditor/gui/TrackgenPanel.java +++ b/src/tools/trackeditor/gui/TrackgenPanel.java @@ -122,7 +122,7 @@ public class TrackgenPanel extends JDialog implements Runnable { String ls_str; String tmp = ""; - String trackgen = "sd2-trackgen"; + String trackgen = editorFrame.getCarsSportsRacing() ? "csr-trackgen" : "sd2-trackgen"; if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty()) { trackgen = editorFrame.getBinDirectory() + sep + trackgen; diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 7a4fa92cf..416697a0f 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.67"; + public final String version = "1.4.68"; private String path; private double imageScale = 1;