[Jake2-commits] jake2/src/jake2/client VID.java,1.17,1.18

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16456/src/jake2/client

Modified Files:
	VID.java 
Log Message:
merge render-refactoring branch into the HEAD

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** VID.java	13 Nov 2005 13:36:00 -0000	1.17
--- VID.java	21 Nov 2006 00:51:39 -0000	1.18
***************
*** 168,172 ****
  	==============
  	*/
! 	static boolean LoadRefresh( String name )
  	{
  
--- 168,172 ----
  	==============
  	*/
! 	static boolean LoadRefresh( String name, boolean fast )
  	{
  
***************
*** 198,202 ****
  
  		Com.Printf( "LoadLibrary(\"" + name +"\")\n" );
! 		Globals.re = Renderer.getDriver(name);
  		
  		if (Globals.re == null)
--- 198,202 ----
  
  		Com.Printf( "LoadLibrary(\"" + name +"\")\n" );
! 		Globals.re = Renderer.getDriver(name, fast);
  		
  		if (Globals.re == null)
***************
*** 257,261 ****
  
  			
! 			if ( !LoadRefresh( vid_ref.string ) )
  			{
  				String renderer;
--- 257,261 ----
  
  			
! 			if ( !LoadRefresh( vid_ref.string, true ) )
  			{
  				String renderer;
***************
*** 274,278 ****
  						Com.Printf("Trying mode 0\n");
  						Cvar.SetValue("gl_mode", 0);
! 						if ( !LoadRefresh( vid_ref.string ) )
  							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!");
  					} else
--- 274,278 ----
  						Com.Printf("Trying mode 0\n");
  						Cvar.SetValue("gl_mode", 0);
! 						if ( !LoadRefresh( vid_ref.string, false ) )
  							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!");
  					} else