diff options
| author | Carsten Weisse <[email protected]> | 2006-11-21 00:52:51 +0000 |
|---|---|---|
| committer | Carsten Weisse <[email protected]> | 2006-11-21 00:52:51 +0000 |
| commit | 17b95195843d63063d989d6a99893ae6300f5ba5 (patch) | |
| tree | 4ccd4fa9039724687039209c039344f285ef0b16 /test | |
| parent | 6cfce25cd7b75c03ee2fc6b238e68f7e4cabb058 (diff) | |
merge render-refactoring branch into the HEAD
Diffstat (limited to 'test')
| -rw-r--r-- | test/jake2/render/DancingQueens.java | 4 | ||||
| -rw-r--r-- | test/jake2/render/TestMap.java | 17 |
2 files changed, 15 insertions, 6 deletions
diff --git a/test/jake2/render/DancingQueens.java b/test/jake2/render/DancingQueens.java index af68d52..345ace5 100644 --- a/test/jake2/render/DancingQueens.java +++ b/test/jake2/render/DancingQueens.java @@ -2,7 +2,7 @@ * DancingQueens.java * Copyright (C) 2003 * - * $Id: DancingQueens.java,v 1.9 2006-01-10 14:34:00 hzi Exp $ + * $Id: DancingQueens.java,v 1.10 2006-11-21 00:48:14 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -79,7 +79,7 @@ public class DancingQueens { String[] names = Renderer.getDriverNames(); System.out.println("Registered Drivers: " + Arrays.asList(names)); - this.re = Renderer.getDriver("fastjogl"); + this.re = Renderer.getDriver("jsr231"); Globals.re = this.re; System.out.println("Use driver: " + re); diff --git a/test/jake2/render/TestMap.java b/test/jake2/render/TestMap.java index f1ade00..9ed10bc 100644 --- a/test/jake2/render/TestMap.java +++ b/test/jake2/render/TestMap.java @@ -2,7 +2,7 @@ * TestMap.java * Copyright (C) 2003 * - * $Id: TestMap.java,v 1.6 2004-12-14 01:08:32 cawe Exp $ + * $Id: TestMap.java,v 1.7 2006-11-21 00:48:14 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -27,6 +27,7 @@ package jake2.render; import jake2.Defines; import jake2.Globals; +import jake2.Jake2; import jake2.client.*; import jake2.game.Cmd; import jake2.game.cvar_t; @@ -71,12 +72,20 @@ public class TestMap void init() { - - Qcommon.Init(new String[] { "TestMap $Id: TestMap.java,v 1.6 2004-12-14 01:08:32 cawe Exp $" }); + Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET); + // open the q2dialog, if we are not in dedicated mode. + if (Globals.dedicated.value != 1.0f) + { + Jake2.Q2Dialog = new Q2DataDialog(); + Locale.setDefault(Locale.US); + Jake2.Q2Dialog.setVisible(true); + } + + Qcommon.Init(new String[] { "TestMap $Id: TestMap.java,v 1.7 2006-11-21 00:48:14 cawe Exp $" }); // sehr wichtig !!! VID.Shutdown(); - this.re = Renderer.getDriver("jogl"); + Globals.re = this.re = Renderer.getDriver("jsr231", false); re.Init(0, 0); |