major refactoring in game, server and client package

1 files changed, 416 insertions, 438 deletions

diff --git a/src/jake2/qcommon/Cvar.java b/src/jake2/qcommon/Cvar.java
index a43464b..7255afd 100644
--- a/src/jake2/qcommon/Cvar.java
+++ b/src/jake2/qcommon/Cvar.java
@@ -2,459 +2,437 @@
  * Cvar.java
  * Copyright (C) 2003
  * 
- * $Id: Cvar.java,v 1.4 2004-08-19 20:56:41 hzi Exp $
+ * $Id: Cvar.java,v 1.5 2004-09-22 19:22:09 salomo Exp $
  */
 /*
-Copyright (C) 1997-2001 Id Software, Inc.
+ Copyright (C) 1997-2001 Id Software, Inc.
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-See the GNU General Public License for more details.
+ See the GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-*/
+ */
 
 package jake2.qcommon;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.Vector;
-
 import jake2.Defines;
 import jake2.Globals;
-import jake2.game.*;
+import jake2.game.Cmd;
+import jake2.game.Info;
+import jake2.game.cvar_t;
 import jake2.util.Lib;
 
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.util.Vector;
+
 /**
- * Cvar implements console variables. The original code is
- * located in cvar.c
+ * Cvar implements console variables. The original code is located in cvar.c
  */
 public class Cvar extends Globals {
 
-	/**
-	 * @param var_name
-	 * @param var_value
-	 * @param flags
-	 * @return
-	 */
-	public static cvar_t Get(String var_name, String var_value, int flags) {
-		cvar_t var;
-
-		if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
-			if (!Info.Info_Validate(var_name)) {
-				Com.Printf("invalid info cvar name\n");
-				return null;
-			}
-		}
-
-		var = Cvar.FindVar(var_name);
-		if (var != null) {
-			var.flags |= flags;
-			return var;
-		}
-
-		if (var_value == null)
-			return null;
-
-		if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
-			if (!InfoValidate(var_value)) {
-				Com.Printf("invalid info cvar value\n");
-				return null;
-			}
-		}
-		var = new cvar_t();
-		var.name = new String(var_name);
-		var.string = new String(var_value);
-		var.modified = true;
-		// handles atof(var.string)
-		try {
-			var.value = Float.parseFloat(var.string);
-		}
-		catch (NumberFormatException e) {
-			var.value = 0.0f;
-		}
-		// link the variable in
-		var.next = Globals.cvar_vars;
-		Globals.cvar_vars = var;
-
-		var.flags = flags;
-
-		return var;
-	}
-
-	static void Init() {
-		Cmd.AddCommand("set", Set_f);
-		Cmd.AddCommand("cvarlist", List_f);
-	}
-
-	public static String VariableString(String var_name) {
-		cvar_t var;
-		var = FindVar(var_name);
-		return (var == null) ? "" : var.string;
-	}
-
-	static cvar_t FindVar(String var_name) {
-		cvar_t var;
-
-		for (var = Globals.cvar_vars; var != null; var = var.next) {
-			if (var_name.equals(var.name))
-				return var;
-		}
-
-		return null;
-	}
-
-	/*
-	============
-	Cvar_FullSet
-	============
-	*/
-	public static cvar_t FullSet(String var_name, String value, int flags) {
-		cvar_t var;
-
-		var = Cvar.FindVar(var_name);
-		if (null == var) { // create it
-			return Cvar.Get(var_name, value, flags);
-		}
-
-		var.modified = true;
-
-		if ((var.flags & CVAR_USERINFO) != 0)
-			Globals.userinfo_modified = true; // transmit at next oportunity
-
-		var.string = value;
-		try {
-			var.value = Float.parseFloat(var.string);
-		} catch (Exception e) {
-			var.value = 0.0f;
-		}
-		
-		var.flags = flags;
-
-		return var;
-	}
-
-	/*
-	============
-	Cvar_Set
-	============
-	*/
-	public static cvar_t Set(String var_name, String value) {
-		return Set2(var_name, value, false);
-	}
-
-	/*
-	============
-	Cvar_Set2
-	============
-	*/
-	static cvar_t Set2(String var_name, String value, boolean force) {
-
-		cvar_t var = Cvar.FindVar(var_name);
-		if (var == null) { // create it
-			return Cvar.Get(var_name, value, 0);
-		}
-
-		if ((var.flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
-			if (!InfoValidate(value)) {
-				Com.Printf("invalid info cvar value\n");
-				return var;
-			}
-		}
-
-		if (!force) {
-			if ((var.flags & CVAR_NOSET) != 0) {
-				Com.Printf(var_name + " is write protected.\n");
-				return var;
-			}
-
-			if ((var.flags & CVAR_LATCH) != 0) {
-				if (var.latched_string != null) {
-					if (value.equals(var.latched_string))
-						return var;
-					//Z_Free (var.latched_string);
-					var.latched_string = null;
-				}
-				else {
-					if (value.equals(var.string))
-						return var;
-				}
-
-				if (Globals.server_state != 0) {
-					Com.Printf(var_name + " will be changed for next game.\n");
-					var.latched_string = value;
-				}
-				else {
-					var.string = value;
-					try {
-						var.value = Float.parseFloat(var.string);
-					} catch (Exception e) {
-						var.value = 0.0f;
-					}
-					if (var.name.equals("game")) {
-						FS.SetGamedir(var.string);
-						FS.ExecAutoexec();
-					}
-				}
-				return var;
-			}
-		}
-		else {
-			if (var.latched_string != null) {
-				//Z_Free(var.latched_string);
-				var.latched_string = null;
-			}
-		}
-
-		if (value.equals(var.string))
-			return var; // not changed
-
-		var.modified = true;
-
-		if ((var.flags & CVAR_USERINFO) != 0)
-			Globals.userinfo_modified = true; // transmit at next oportunity
-
-		var.string = value;
-		try {
-			var.value = Float.parseFloat(var.string);
-		} catch (Exception e) {
-			var.value = 0.0f;
-		}
-
-		return var;
-	}
-
-	static xcommand_t Set_f = new xcommand_t() {
-		public void execute() {
-			int c;
-			int flags;
-
-			c = Cmd.Argc();
-			if (c != 3 && c != 4) {
-				Com.Printf("usage: set <variable> <value> [u / s]\n");
-				return;
-			}
-
-			if (c == 4) {
-				if (Cmd.Argv(3).equals("u"))
-					flags = CVAR_USERINFO;
-				else if (Cmd.Argv(3).equals("s"))
-					flags = CVAR_SERVERINFO;
-				else {
-					Com.Printf("flags can only be 'u' or 's'\n");
-					return;
-				}
-				Cvar.FullSet(Cmd.Argv(1), Cmd.Argv(2), flags);
-			}
-			else
-				Cvar.Set(Cmd.Argv(1), Cmd.Argv(2));
-
-		}
-
-	};
-
-	static xcommand_t List_f = new xcommand_t() {
-		public void execute() {
-			cvar_t var;
-			int i;
-
-			i = 0;
-			for (var = Globals.cvar_vars; var != null; var = var.next, i++) {
-				if ((var.flags & CVAR_ARCHIVE) != 0)
-					Com.Printf("*");
-				else
-					Com.Printf(" ");
-				if ((var.flags & CVAR_USERINFO) != 0)
-					Com.Printf("U");
-				else
-					Com.Printf(" ");
-				if ((var.flags & CVAR_SERVERINFO) != 0)
-					Com.Printf("S");
-				else
-					Com.Printf(" ");
-				if ((var.flags & CVAR_NOSET) != 0)
-					Com.Printf("-");
-				else if ((var.flags & CVAR_LATCH) != 0)
-					Com.Printf("L");
-				else
-					Com.Printf(" ");
-				Com.Printf(" " + var.name + " \"" + var.string + "\"\n");
-			}
-			Com.Printf(i + " cvars\n");
-		}
-	};
-
-	/*
-	============
-	Cvar_ForceSet
-	============
-	*/
-	public static cvar_t ForceSet(String var_name, String value) {
-		return Cvar.Set2(var_name, value, true);
-	}
-	/*
-	============
-	Cvar_SetValue
-	============
-	*/
-	public static void SetValue(String var_name, float value) {
-		Cvar.Set(var_name, "" + value);
-	}
-
-	/*
-	============
-	Cvar_VariableValue
-	============
-	*/
-	public static float VariableValue(String var_name) {
-		cvar_t var = Cvar.FindVar(var_name);
-		if (var == null)
-			return 0;
-		float val = 0.0f;
-		try {
-			val = Float.parseFloat(var.string);
-		} catch (Exception e) {}
-		return val;
-	}
-
-	/*
-	============
-	Cvar_Command
-	
-	Handles variable inspection and changing from the console
-	============
-	*/
-	public static boolean Command() {
-		cvar_t v;
-
-		// check variables
-		v = Cvar.FindVar(Cmd.Argv(0));
-		if (v == null)
-			return false;
-
-		// perform a variable print or set
-		if (Cmd.Argc() == 1) {
-			Com.Printf("\"" + v.name + "\" is \"" + v.string + "\"\n");
-			return true;
-		}
-
-		Cvar.Set(v.name, Cmd.Argv(1));
-		return true;
-	}
-
-	public static String BitInfo(int bit) {
-		String info;
-		cvar_t var;
-
-		info = "";
-
-		for (var = Globals.cvar_vars; var != null; var = var.next) {
-			if ((var.flags & bit) != 0)
-				info = Info.Info_SetValueForKey1(info, var.name, var.string);
-		}
-		return info;
-	}
-
-	// returns an info string containing all the CVAR_SERVERINFO cvars
-	public static String Serverinfo() {
-		return BitInfo(Defines.CVAR_SERVERINFO);
-	}
-
-	public static void GetLatchedVars() {
-		cvar_t var;
-
-		for (var = Globals.cvar_vars; var != null; var = var.next) {
-			if (var.latched_string == null || var.latched_string == "")
-				continue;
-			var.string = var.latched_string;
-			var.latched_string = null;
-			try {
-				var.value = Float.parseFloat(var.string);
-			}
-			catch (NumberFormatException e) {
-				var.value = 0.0f;
-			}
-			if (var.name.equals("game")) {
-				FS.SetGamedir(var.string);
-				FS.ExecAutoexec();
-			}
-		}
-	}
-
-	/**
-	 * returns an info string containing all the CVAR_USERINFO cvars.
-	 */
-	public static String Userinfo() {
-		return BitInfo(CVAR_USERINFO);
-	}
-
-	public static void WriteVariables(String path) {
-		cvar_t var;
-		RandomAccessFile f;
-		String buffer;
-
-		f = Lib.fopen(path, "rw");
-		if (f == null)
-			return;
-
-		try {
-			f.seek(f.length());
-		} catch (IOException e1) {
-			fclose(f);
-			return;
-		}
-		for (var = cvar_vars; var != null; var = var.next) {
-			if ((var.flags & CVAR_ARCHIVE) != 0) {
-				buffer = "set " + var.name + " \"" + var.string + "\"\n";
-				try {
-					f.writeBytes(buffer);
-				}
-				catch (IOException e) {
-				}
-			}
-		}
-		fclose(f);
-	}
-
-	/*
-	============
-	Cvar_CompleteVariable
-	============
-	*/
-	public static Vector CompleteVariable(String partial) {
-		
-		Vector vars = new Vector();
-
-		// check match
-		for (cvar_t cvar = Globals.cvar_vars; cvar != null; cvar = cvar.next)
-			if (cvar.name.startsWith(partial))
-				vars.add(cvar.name);
-		
-		return vars;
-	}
-
-	/*
-	============
-	Cvar_InfoValidate
-	============
-	*/
-	static boolean InfoValidate(String s) {
-		if (s.indexOf("\\") != -1)
-			return false;
-		if (s.indexOf("\"") != -1)
-			return false;
-		if (s.indexOf(";") != -1)
-			return false;
-		return true;
-	}
-}
+    /**
+     * @param var_name
+     * @param var_value
+     * @param flags
+     * @return
+     */
+    public static cvar_t Get(String var_name, String var_value, int flags) {
+        cvar_t var;
+
+        if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
+            if (!Info.Info_Validate(var_name)) {
+                Com.Printf("invalid info cvar name\n");
+                return null;
+            }
+        }
+
+        var = Cvar.FindVar(var_name);
+        if (var != null) {
+            var.flags |= flags;
+            return var;
+        }
+
+        if (var_value == null)
+            return null;
+
+        if ((flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
+            if (!InfoValidate(var_value)) {
+                Com.Printf("invalid info cvar value\n");
+                return null;
+            }
+        }
+        var = new cvar_t();
+        var.name = new String(var_name);
+        var.string = new String(var_value);
+        var.modified = true;
+        // handles atof(var.string)
+        try {
+            var.value = Float.parseFloat(var.string);
+        } catch (NumberFormatException e) {
+            var.value = 0.0f;
+        }
+        // link the variable in
+        var.next = Globals.cvar_vars;
+        Globals.cvar_vars = var;
+
+        var.flags = flags;
+
+        return var;
+    }
+
+    static void Init() {
+        Cmd.AddCommand("set", Set_f);
+        Cmd.AddCommand("cvarlist", List_f);
+    }
+
+    public static String VariableString(String var_name) {
+        cvar_t var;
+        var = FindVar(var_name);
+        return (var == null) ? "" : var.string;
+    }
+
+    static cvar_t FindVar(String var_name) {
+        cvar_t var;
+
+        for (var = Globals.cvar_vars; var != null; var = var.next) {
+            if (var_name.equals(var.name))
+                return var;
+        }
+
+        return null;
+    }
+
+    /*
+     * ============ Cvar_FullSet ============
+     */
+    public static cvar_t FullSet(String var_name, String value, int flags) {
+        cvar_t var;
+
+        var = Cvar.FindVar(var_name);
+        if (null == var) { // create it
+            return Cvar.Get(var_name, value, flags);
+        }
+
+        var.modified = true;
+
+        if ((var.flags & CVAR_USERINFO) != 0)
+            Globals.userinfo_modified = true; // transmit at next oportunity
+
+        var.string = value;
+        try {
+            var.value = Float.parseFloat(var.string);
+        } catch (Exception e) {
+            var.value = 0.0f;
+        }
+
+        var.flags = flags;
+
+        return var;
+    }
+
+    /*
+     * ============ Cvar_Set ============
+     */
+    public static cvar_t Set(String var_name, String value) {
+        return Set2(var_name, value, false);
+    }
+
+    /*
+     * ============ Cvar_Set2 ============
+     */
+    static cvar_t Set2(String var_name, String value, boolean force) {
+
+        cvar_t var = Cvar.FindVar(var_name);
+        if (var == null) { // create it
+            return Cvar.Get(var_name, value, 0);
+        }
+
+        if ((var.flags & (CVAR_USERINFO | CVAR_SERVERINFO)) != 0) {
+            if (!InfoValidate(value)) {
+                Com.Printf("invalid info cvar value\n");
+                return var;
+            }
+        }
+
+        if (!force) {
+            if ((var.flags & CVAR_NOSET) != 0) {
+                Com.Printf(var_name + " is write protected.\n");
+                return var;
+            }
+
+            if ((var.flags & CVAR_LATCH) != 0) {
+                if (var.latched_string != null) {
+                    if (value.equals(var.latched_string))
+                        return var;
+                    //Z_Free (var.latched_string);
+                    var.latched_string = null;
+                } else {
+                    if (value.equals(var.string))
+                        return var;
+                }
+
+                if (Globals.server_state != 0) {
+                    Com.Printf(var_name + " will be changed for next game.\n");
+                    var.latched_string = value;
+                } else {
+                    var.string = value;
+                    try {
+                        var.value = Float.parseFloat(var.string);
+                    } catch (Exception e) {
+                        var.value = 0.0f;
+                    }
+                    if (var.name.equals("game")) {
+                        FS.SetGamedir(var.string);
+                        FS.ExecAutoexec();
+                    }
+                }
+                return var;
+            }
+        } else {
+            if (var.latched_string != null) {
+                //Z_Free(var.latched_string);
+                var.latched_string = null;
+            }
+        }
+
+        if (value.equals(var.string))
+            return var; // not changed
+
+        var.modified = true;
+
+        if ((var.flags & CVAR_USERINFO) != 0)
+            Globals.userinfo_modified = true; // transmit at next oportunity
+
+        var.string = value;
+        try {
+            var.value = Float.parseFloat(var.string);
+        } catch (Exception e) {
+            var.value = 0.0f;
+        }
+
+        return var;
+    }
+
+    static xcommand_t Set_f = new xcommand_t() {
+        public void execute() {
+            int c;
+            int flags;
+
+            c = Cmd.Argc();
+            if (c != 3 && c != 4) {
+                Com.Printf("usage: set <variable> <value> [u / s]\n");
+                return;
+            }
+
+            if (c == 4) {
+                if (Cmd.Argv(3).equals("u"))
+                    flags = CVAR_USERINFO;
+                else if (Cmd.Argv(3).equals("s"))
+                    flags = CVAR_SERVERINFO;
+                else {
+                    Com.Printf("flags can only be 'u' or 's'\n");
+                    return;
+                }
+                Cvar.FullSet(Cmd.Argv(1), Cmd.Argv(2), flags);
+            } else
+                Cvar.Set(Cmd.Argv(1), Cmd.Argv(2));
+
+        }
+
+    };
+
+    static xcommand_t List_f = new xcommand_t() {
+        public void execute() {
+            cvar_t var;
+            int i;
+
+            i = 0;
+            for (var = Globals.cvar_vars; var != null; var = var.next, i++) {
+                if ((var.flags & CVAR_ARCHIVE) != 0)
+                    Com.Printf("*");
+                else
+                    Com.Printf(" ");
+                if ((var.flags & CVAR_USERINFO) != 0)
+                    Com.Printf("U");
+                else
+                    Com.Printf(" ");
+                if ((var.flags & CVAR_SERVERINFO) != 0)
+                    Com.Printf("S");
+                else
+                    Com.Printf(" ");
+                if ((var.flags & CVAR_NOSET) != 0)
+                    Com.Printf("-");
+                else if ((var.flags & CVAR_LATCH) != 0)
+                    Com.Printf("L");
+                else
+                    Com.Printf(" ");
+                Com.Printf(" " + var.name + " \"" + var.string + "\"\n");
+            }
+            Com.Printf(i + " cvars\n");
+        }
+    };
+
+    /*
+     * ============ Cvar_ForceSet ============
+     */
+    public static cvar_t ForceSet(String var_name, String value) {
+        return Cvar.Set2(var_name, value, true);
+    }
+
+    /*
+     * ============ Cvar_SetValue ============
+     */
+    public static void SetValue(String var_name, float value) {
+        Cvar.Set(var_name, "" + value);
+    }
+
+    /*
+     * ============ Cvar_VariableValue ============
+     */
+    public static float VariableValue(String var_name) {
+        cvar_t var = Cvar.FindVar(var_name);
+        if (var == null)
+            return 0;
+        float val = 0.0f;
+        try {
+            val = Float.parseFloat(var.string);
+        } catch (Exception e) {
+        }
+        return val;
+    }
+
+    /*
+     * ============ Cvar_Command
+     * 
+     * Handles variable inspection and changing from the console ============
+     */
+    public static boolean Command() {
+        cvar_t v;
+
+        // check variables
+        v = Cvar.FindVar(Cmd.Argv(0));
+        if (v == null)
+            return false;
+
+        // perform a variable print or set
+        if (Cmd.Argc() == 1) {
+            Com.Printf("\"" + v.name + "\" is \"" + v.string + "\"\n");
+            return true;
+        }
+
+        Cvar.Set(v.name, Cmd.Argv(1));
+        return true;
+    }
+
+    public static String BitInfo(int bit) {
+        String info;
+        cvar_t var;
+
+        info = "";
+
+        for (var = Globals.cvar_vars; var != null; var = var.next) {
+            if ((var.flags & bit) != 0)
+                info = Info.Info_SetValueForKey1(info, var.name, var.string);
+        }
+        return info;
+    }
+
+    // returns an info string containing all the CVAR_SERVERINFO cvars
+    public static String Serverinfo() {
+        return BitInfo(Defines.CVAR_SERVERINFO);
+    }
+
+    public static void GetLatchedVars() {
+        cvar_t var;
+
+        for (var = Globals.cvar_vars; var != null; var = var.next) {
+            if (var.latched_string == null || var.latched_string == "")
+                continue;
+            var.string = var.latched_string;
+            var.latched_string = null;
+            try {
+                var.value = Float.parseFloat(var.string);
+            } catch (NumberFormatException e) {
+                var.value = 0.0f;
+            }
+            if (var.name.equals("game")) {
+                FS.SetGamedir(var.string);
+                FS.ExecAutoexec();
+            }
+        }
+    }
+
+    /**
+     * returns an info string containing all the CVAR_USERINFO cvars.
+     */
+    public static String Userinfo() {
+        return BitInfo(CVAR_USERINFO);
+    }
+
+    public static void WriteVariables(String path) {
+        cvar_t var;
+        RandomAccessFile f;
+        String buffer;
+
+        f = Lib.fopen(path, "rw");
+        if (f == null)
+            return;
+
+        try {
+            f.seek(f.length());
+        } catch (IOException e1) {
+            Lib.fclose(f);
+            return;
+        }
+        for (var = cvar_vars; var != null; var = var.next) {
+            if ((var.flags & CVAR_ARCHIVE) != 0) {
+                buffer = "set " + var.name + " \"" + var.string + "\"\n";
+                try {
+                    f.writeBytes(buffer);
+                } catch (IOException e) {
+                }
+            }
+        }
+        Lib.fclose(f);
+    }
+
+    /*
+     * ============ Cvar_CompleteVariable ============
+     */
+    public static Vector CompleteVariable(String partial) {
+
+        Vector vars = new Vector();
+
+        // check match
+        for (cvar_t cvar = Globals.cvar_vars; cvar != null; cvar = cvar.next)
+            if (cvar.name.startsWith(partial))
+                vars.add(cvar.name);
+
+        return vars;
+    }
+
+    /*
+     * ============ Cvar_InfoValidate ============
+     */
+    static boolean InfoValidate(String s) {
+        if (s.indexOf("\\") != -1)
+            return false;
+        if (s.indexOf("\"") != -1)
+            return false;
+        if (s.indexOf(";") != -1)
+            return false;
+        return true;
+    }
+}
\ No newline at end of file