diff options
author | Sven Gothel <[email protected]> | 2012-10-23 01:09:52 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-10-23 01:09:52 +0200 |
commit | 953acae56d7cf60db712d8486a69552aac9ca6a1 (patch) | |
tree | 89c5c6f2f4b39d01f24c2e0decab01930c6111e6 /src/jake2/Jake2.java | |
parent | 27d3b3e990ae872a5935312ecaf42a12076fd3dc (diff) |
Cleanup: Revert minor (semantic) differences introduced in f5612e7dfc635359f15b402c2ee9022a5e703a9d, in search of regression introduced w/ same commit
Diffstat (limited to 'src/jake2/Jake2.java')
-rw-r--r-- | src/jake2/Jake2.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/jake2/Jake2.java b/src/jake2/Jake2.java index 2d1385a..33d2544 100644 --- a/src/jake2/Jake2.java +++ b/src/jake2/Jake2.java @@ -25,6 +25,8 @@ */ package jake2; +import java.util.Locale; + import jake2.qcommon.*; import jake2.sys.Timer; @@ -35,8 +37,15 @@ import jake2.sys.Timer; */ public final class Jake2 { - // public static Q2DataDialog Q2Dialog; + // public static Q2DataDialog q2DataTool; public static Q2DataTool q2DataTool; + + /* pp */ static final void initQ2DataTool() { + q2DataTool = new Q2DataTool(); + // q2DataTool = new Q2DataDialog(); + Locale.setDefault(Locale.US); + // q2DataTool.setVisible(true); + } /** * main is used to start the game. Quake2 for Java supports the following @@ -79,12 +88,8 @@ public final class Jake2 { // open the q2dialog, if we are not in dedicated mode. - if (Globals.dedicated.value != 1.0f) - { - q2DataTool = new Q2DataTool(); - // Q2Dialog = new Q2DataDialog(); - // Locale.setDefault(Locale.US); - // Q2Dialog.setVisible(true); + if (Globals.dedicated.value != 1.0f) { + Jake2.initQ2DataTool(); } // in C the first arg is the filename |