[Jake2-commits] jake2/src/jake2/client VID.java,1.12,1.13

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

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

Modified Files:
	VID.java 
Log Message:
uses Renderer to select the default or the prefered driver name;
null termination of String[] removed (menu labels)  

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** VID.java	11 Jan 2005 15:53:56 -0000	1.12
--- VID.java	12 Jan 2005 00:40:14 -0000	1.13
***************
*** 256,262 ****
  			Globals.cls.disable_screen = 1.0f; // true;
  
  			if ( !LoadRefresh( vid_ref.string ) )
  			{
! 				if ( vid_ref.string.equals("jogl") ) {
  					Com.Printf("Refresh failed\n");
  					gl_mode = Cvar.Get( "gl_mode", "0", 0 );
--- 256,264 ----
  			Globals.cls.disable_screen = 1.0f; // true;
  
+ 			String defaultName = Renderer.getDefaultName();
+ 			
  			if ( !LoadRefresh( vid_ref.string ) )
  			{
! 				if ( vid_ref.string.equals(defaultName) ) {
  					Com.Printf("Refresh failed\n");
  					gl_mode = Cvar.Get( "gl_mode", "0", 0 );
***************
*** 265,274 ****
  						Cvar.SetValue("gl_mode", 0);
  						if ( !LoadRefresh( vid_ref.string ) )
! 							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to jogl refresh!");
  					} else
! 						Com.Error(Defines.ERR_FATAL, "Couldn't fall back to jogl refresh!");
  				}
  
! 				Cvar.Set( "vid_ref", "jogl" );
  
  				/*
--- 267,276 ----
  						Cvar.SetValue("gl_mode", 0);
  						if ( !LoadRefresh( vid_ref.string ) )
! 							Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!");
  					} else
! 						Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + defaultName +" refresh!");
  				}
  
! 				Cvar.Set("vid_ref", defaultName);
  
  				/*
***************
*** 295,299 ****
  	{
  		/* Create the video variables so we know how to start the graphics drivers */
! 		vid_ref = Cvar.Get("vid_ref", "fastjogl", CVAR_ARCHIVE);
  		vid_xpos = Cvar.Get("vid_xpos", "3", CVAR_ARCHIVE);
  		vid_ypos = Cvar.Get("vid_ypos", "22", CVAR_ARCHIVE);
--- 297,301 ----
  	{
  		/* Create the video variables so we know how to start the graphics drivers */
! 		vid_ref = Cvar.Get("vid_ref", Renderer.getPreferedName(), CVAR_ARCHIVE);
  		vid_xpos = Cvar.Get("vid_xpos", "3", CVAR_ARCHIVE);
  		vid_ypos = Cvar.Get("vid_ypos", "22", CVAR_ARCHIVE);
***************
*** 507,511 ****
  		"[2048 1536]",
  		"user mode",
- 		null
  	};
  	static String[] fs_resolutions;
--- 509,512 ----
***************
*** 523,527 ****
  		"[OpenGL fastjogl]",
  		"[OpenGL lwjgl   ]",
- 		null
  	};
  	static final String[] yesno_names =
--- 524,527 ----
***************
*** 529,538 ****
  		"no",
  		"yes",
- 		null
  	};
  
  	static void initModeList() {
  		DisplayMode[] modes = re.getModeList();
! 		fs_resolutions = new String[modes.length + 1];
  		fs_modes = new vidmode_t[modes.length];
  		for (int i = 0; i < modes.length; i++) {
--- 529,537 ----
  		"no",
  		"yes",
  	};
  
  	static void initModeList() {
  		DisplayMode[] modes = re.getModeList();
! 		fs_resolutions = new String[modes.length];
  		fs_modes = new vidmode_t[modes.length];
  		for (int i = 0; i < modes.length; i++) {
***************
*** 563,567 ****
  		
  		if ( gl_driver == null )
! 			gl_driver = Cvar.Get( "gl_driver", "jogl", 0 );
  		if ( gl_picmip == null )
  			gl_picmip = Cvar.Get( "gl_picmip", "0", 0 );
--- 562,566 ----
  		
  		if ( gl_driver == null )
! 			gl_driver = Cvar.Get( "gl_driver", Renderer.getPreferedName(), 0 );
  		if ( gl_picmip == null )
  			gl_picmip = Cvar.Get( "gl_picmip", "0", 0 );