diff options
| author | Carsten Weisse <[email protected]> | 2005-02-13 17:03:43 +0000 |
|---|---|---|
| committer | Carsten Weisse <[email protected]> | 2005-02-13 17:03:43 +0000 |
| commit | cb3daca18d606d4c79f1613b09da4d752ba2feb4 (patch) | |
| tree | 6d6e19dc8f5a192a6397869296cb29af14faae0f | |
| parent | 9726689414140e7a2ddb4e1faf0f415fc12bd557 (diff) | |
GameBase.dedicated removed; use Globals.dedicated instead
(defined twice)
| -rw-r--r-- | src/jake2/game/Cmd.java | 4 | ||||
| -rw-r--r-- | src/jake2/game/GameBase.java | 4 | ||||
| -rw-r--r-- | src/jake2/game/GameSave.java | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/jake2/game/Cmd.java b/src/jake2/game/Cmd.java index f530063..4fd5277 100644 --- a/src/jake2/game/Cmd.java +++ b/src/jake2/game/Cmd.java @@ -2,7 +2,7 @@ * Cmd.java * Copyright (C) 2003 * - * $Id: Cmd.java,v 1.11 2005-02-06 18:53:50 salomo Exp $ + * $Id: Cmd.java,v 1.12 2005-02-13 17:02:46 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -1118,7 +1118,7 @@ public final class Cmd { cl.flood_when[cl.flood_whenhead] = GameBase.level.time; } - if (GameBase.dedicated.value != 0) + if (Globals.dedicated.value != 0) SV_GAME.PF_cprintf(null, Defines.PRINT_CHAT, "" + text + ""); for (j = 1; j <= GameBase.game.maxclients; j++) { diff --git a/src/jake2/game/GameBase.java b/src/jake2/game/GameBase.java index f9b83de..dc6950e 100644 --- a/src/jake2/game/GameBase.java +++ b/src/jake2/game/GameBase.java @@ -19,7 +19,7 @@ */ // Created on 30.11.2003 by RST. -// $Id: GameBase.java,v 1.8 2004-09-22 19:22:05 salomo Exp $ +// $Id: GameBase.java,v 1.9 2005-02-13 17:02:45 cawe Exp $ /** Father of all GameObjects. */ package jake2.game; @@ -83,8 +83,6 @@ public class GameBase { public static cvar_t g_select_empty = new cvar_t(); - public static cvar_t dedicated = new cvar_t(); - public static cvar_t filterban = new cvar_t(); public static cvar_t sv_maxvelocity = new cvar_t(); diff --git a/src/jake2/game/GameSave.java b/src/jake2/game/GameSave.java index c3d07b1..0e35d64 100644 --- a/src/jake2/game/GameSave.java +++ b/src/jake2/game/GameSave.java @@ -19,7 +19,7 @@ */ // Created on 29.12.2003 by RST. -// $Id: GameSave.java,v 1.7 2004-09-22 19:22:01 salomo Exp $ +// $Id: GameSave.java,v 1.8 2005-02-13 17:03:43 cawe Exp $ package jake2.game; import jake2.Defines; @@ -63,7 +63,7 @@ public class GameSave { GameBase.sv_gravity = GameBase.gi.cvar("sv_gravity", "800", 0); // noset vars - GameBase.dedicated = GameBase.gi.cvar("dedicated", "0", + Globals.dedicated = GameBase.gi.cvar("dedicated", "0", Defines.CVAR_NOSET); // latched vars |