debug messages clean up, shotgun switched back to blaster.

3 files changed, 12 insertions, 13 deletions

diff --git a/src/jake2/game/PlayerClient.java b/src/jake2/game/PlayerClient.java
index 3bb09f0..980f0cb 100644
--- a/src/jake2/game/PlayerClient.java
+++ b/src/jake2/game/PlayerClient.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 28.12.2003 by RST.
-// $Id: PlayerClient.java,v 1.4 2004-08-20 21:29:58 salomo Exp $
+// $Id: PlayerClient.java,v 1.5 2004-09-04 09:01:01 salomo Exp $
 
 package jake2.game;
 
@@ -304,17 +304,18 @@ public class PlayerClient extends PlayerHud {
 	public static void InitClientPersistant(gclient_t client) {
 		gitem_t item;
 
-		//memset(& client.pers, 0, sizeof(client.pers));
 		client.pers = new client_persistant_t();
 
 		item = FindItem("Blaster");
 		client.pers.selected_item = ITEM_INDEX(item);
 		client.pers.inventory[client.pers.selected_item] = 1;
 		
+		/* Give shotgun.
 		item = FindItem("Shotgun");
 		client.pers.selected_item = ITEM_INDEX(item);
 		client.pers.inventory[client.pers.selected_item] = 1;
-
+		*/
+		
 		client.pers.weapon = item;
 
 		client.pers.health = 100;
diff --git a/src/jake2/game/SuperAdapter.java b/src/jake2/game/SuperAdapter.java
index 29dcfb5..fd7e216 100644
--- a/src/jake2/game/SuperAdapter.java
+++ b/src/jake2/game/SuperAdapter.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 09.01.2004 by RST.
-// $Id: SuperAdapter.java,v 1.2 2004-08-20 21:29:58 salomo Exp $
+// $Id: SuperAdapter.java,v 1.3 2004-09-04 09:01:01 salomo Exp $
 
 package jake2.game;
 
@@ -43,13 +43,12 @@ public class SuperAdapter
 	/** Returns the adapter from the repository given by its ID. */
 	public static SuperAdapter getFromID(String key)
 	{
-		System.out.println("SuperAdapter.getFromID(\""  + key  + "\")");
 		SuperAdapter sa = (SuperAdapter) adapters.get(key);
 		
 		// try to create the adapter
 		if (sa == null)
 		{
-			System.out.println("adapter not found:" + key);
+			Com.DPrintf("SuperAdapter.getFromID():adapter not found->" + key + "\n");
 			int pos = key.indexOf('$');
 			String classname = key; 
 			if (pos != -1)
@@ -58,19 +57,19 @@ public class SuperAdapter
 			// load class and instantiate
 			try
 			{
-				System.err.println("loading class " + classname);
+				//Com.DPrintf("SuperAdapter.getFromID():loading class->" + classname + "\n");
 				Class.forName(classname).newInstance();
 			}
 			catch(Exception e)
 			{
-				System.err.println("jake2: class not found:" + classname);
+				Com.DPrintf("SuperAdapter.getFromID():class not found->" + classname + "\n");
 			}
 			
 			// try it again...			
 			sa = (SuperAdapter) adapters.get(key);
 			
 			if (sa == null)
-				System.err.println("jake2: could not load adapter:" + key);
+				Com.DPrintf("jake2: could not load adapter:" + key + "\n");
 		}
 		
 		return sa;
@@ -83,7 +82,7 @@ public class SuperAdapter
 		adapterid= tr[2].getClassName();
 		if (adapterid == "")
 			new Throwable("error in creating an adapter id!").printStackTrace();
-		else 
+		else
 			register(this, adapterid);
 	}
 
diff --git a/src/jake2/server/SV_CCMDS.java b/src/jake2/server/SV_CCMDS.java
index 757fb0e..8398cd5 100644
--- a/src/jake2/server/SV_CCMDS.java
+++ b/src/jake2/server/SV_CCMDS.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 18.01.2004 by RST.
-// $Id: SV_CCMDS.java,v 1.8 2004-08-29 21:39:25 hzi Exp $
+// $Id: SV_CCMDS.java,v 1.9 2004-09-04 09:01:01 salomo Exp $
 
 package jake2.server;
 
@@ -211,8 +211,7 @@ public class SV_CCMDS extends SV_ENTS {
 		int l= -1;
 		byte buffer[]= new byte[65536];
 
-		Com.DPrintf("CopyFile (" + src + ", " + dst + ")\n");
-		System.out.println("CopyFile (" + src + ", " + dst + ")\n");
+		//Com.DPrintf("CopyFile (" + src + ", " + dst + ")\n");
 		try {
 			f1= new RandomAccessFile(src, "r");
 		}