[Jake2-commits] jake2/src/jake2/qcommon Qcommon.java,1.12,1.12.2.1

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1235/src/jake2/qcommon

Modified Files:
      Tag: RST
	Qcommon.java 
Log Message:


Index: Qcommon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** Qcommon.java	3 Nov 2004 08:53:27 -0000	1.12
--- Qcommon.java	31 Dec 2004 14:08:32 -0000	1.12.2.1
***************
*** 78,87 ****
  
  			Jake2.Q2Dialog.setStatus("loading config...");
! 			reconfigure();
  
  			FS.setCDDir(); // use cddir from config.cfg
  			FS.markBaseSearchPaths(); // mark the default search paths
  			Jake2.Q2Dialog.testQ2Data(); // test for valid baseq2
! 			reconfigure(); // reload default.cfg and config.cfg
  			
  			//
--- 78,87 ----
  
  			Jake2.Q2Dialog.setStatus("loading config...");
! 			reconfigure(false);
  
  			FS.setCDDir(); // use cddir from config.cfg
  			FS.markBaseSearchPaths(); // mark the default search paths
  			Jake2.Q2Dialog.testQ2Data(); // test for valid baseq2
! 			reconfigure(true); // reload default.cfg and config.cfg
  			
  			//
***************
*** 234,238 ****
  	}
  
! 	static void reconfigure() {
  		Cbuf.AddText("exec default.cfg\n");
  		Cbuf.AddText("bind MWHEELUP weapnext\n");
--- 234,238 ----
  	}
  
! 	static void reconfigure(boolean clear) {
  		Cbuf.AddText("exec default.cfg\n");
  		Cbuf.AddText("bind MWHEELUP weapnext\n");
***************
*** 242,246 ****
  		Cbuf.AddText("exec config.cfg\n");
  
! 		Cbuf.AddEarlyCommands(true);
  		Cbuf.Execute();		 
  	}
--- 242,246 ----
  		Cbuf.AddText("exec config.cfg\n");
  
! 		Cbuf.AddEarlyCommands(clear);
  		Cbuf.Execute();		 
  	}