diff options
Diffstat (limited to 'src/jake2/qcommon/Qcommon.java')
| -rw-r--r-- | src/jake2/qcommon/Qcommon.java | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/src/jake2/qcommon/Qcommon.java b/src/jake2/qcommon/Qcommon.java index bd4ca88..79f6f29 100644 --- a/src/jake2/qcommon/Qcommon.java +++ b/src/jake2/qcommon/Qcommon.java @@ -74,21 +74,24 @@ public final class Qcommon extends Globals { Cbuf.AddEarlyCommands(false); Cbuf.Execute(); - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.setStatus("initializing filesystem..."); + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.setStatus("initializing filesystem..."); + } FS.InitFilesystem(); - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.setStatus("loading config..."); + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.setStatus("loading config..."); + } reconfigure(false); FS.setCDDir(); // use cddir from config.cfg FS.markBaseSearchPaths(); // mark the default search paths - - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.testQ2Data(); // test for valid baseq2 + + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.testQ2Data(); // test for valid baseq2 + } reconfigure(true); // reload default.cfg and config.cfg @@ -114,18 +117,21 @@ public final class Qcommon extends Globals { Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET); - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.setStatus("initializing network subsystem..."); + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.setStatus("initializing network subsystem..."); + } NET.Init(); //ok Netchan.Netchan_Init(); //ok - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.setStatus("initializing server subsystem..."); + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.setStatus("initializing server subsystem..."); + } SV_MAIN.SV_Init(); //ok - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.setStatus("initializing client subsystem..."); + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.setStatus("initializing client subsystem..."); + } CL.Init(); @@ -148,9 +154,10 @@ public final class Qcommon extends Globals { // save config when configuration is completed CL.WriteConfiguration(); - - if (Globals.dedicated.value != 1.0f) - Jake2.Q2Dialog.dispose(); + + if (Globals.dedicated.value != 1.0f) { + Jake2.q2DataTool.destroy(); + } } catch (longjmpException e) { Sys.Error("Error during initialization"); |