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
This commit is contained in:
parent
2190b4f0fb
commit
f63458c0c8
4 changed files with 5 additions and 4 deletions
|
@ -124,7 +124,7 @@ public class DeltaPanel extends JDialog implements Runnable
|
||||||
try {
|
try {
|
||||||
String ls_str;
|
String ls_str;
|
||||||
String tmp = "";
|
String tmp = "";
|
||||||
String trackgen = "sd2-trackgen";
|
String trackgen = editorFrame.getCarsSportsRacing() ? "csr-trackgen" : "sd2-trackgen";
|
||||||
if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty()) {
|
if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty()) {
|
||||||
trackgen = editorFrame.getBinDirectory() + sep + trackgen;
|
trackgen = editorFrame.getBinDirectory() + sep + trackgen;
|
||||||
}
|
}
|
||||||
|
|
|
@ -402,7 +402,8 @@ public class EditorFrame extends JFrame
|
||||||
"load the default surfaces, textures and objects.\n" +
|
"load the default surfaces, textures and objects.\n" +
|
||||||
"Make sure you have write permission if you intend to edit or add\n" +
|
"Make sure you have write permission if you intend to edit or add\n" +
|
||||||
"tracks in this directory.\n\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.",
|
"located if it is not in your executable path.",
|
||||||
"First Time Setup",
|
"First Time Setup",
|
||||||
JOptionPane.INFORMATION_MESSAGE);
|
JOptionPane.INFORMATION_MESSAGE);
|
||||||
|
|
|
@ -122,7 +122,7 @@ public class TrackgenPanel extends JDialog implements Runnable
|
||||||
{
|
{
|
||||||
String ls_str;
|
String ls_str;
|
||||||
String tmp = "";
|
String tmp = "";
|
||||||
String trackgen = "sd2-trackgen";
|
String trackgen = editorFrame.getCarsSportsRacing() ? "csr-trackgen" : "sd2-trackgen";
|
||||||
if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty())
|
if (editorFrame.getBinDirectory() != null && !editorFrame.getBinDirectory().isEmpty())
|
||||||
{
|
{
|
||||||
trackgen = editorFrame.getBinDirectory() + sep + trackgen;
|
trackgen = editorFrame.getBinDirectory() + sep + trackgen;
|
||||||
|
|
|
@ -34,7 +34,7 @@ public class Properties
|
||||||
private static Properties instance = new Properties();
|
private static Properties instance = new Properties();
|
||||||
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
|
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
|
||||||
public final String title = "sd2-trackeditor";
|
public final String title = "sd2-trackeditor";
|
||||||
public final String version = "1.4.67";
|
public final String version = "1.4.68";
|
||||||
private String path;
|
private String path;
|
||||||
|
|
||||||
private double imageScale = 1;
|
private double imageScale = 1;
|
||||||
|
|
Loading…
Reference in a new issue