Update of /cvsroot/jake2/jake2/src/jake2/client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1272/src/jake2/client
Modified Files:
VID.java
Log Message:
merge last changes from 0.9.4 branch
Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** VID.java 7 Apr 2005 15:29:21 -0000 1.15
--- VID.java 26 May 2005 16:56:33 -0000 1.16
***************
*** 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 );
--- 256,272 ----
Globals.cls.disable_screen = 1.0f; // true;
if ( !LoadRefresh( vid_ref.string ) )
{
! String renderer;
! if (vid_ref.string.equals(Renderer.getPreferedName())) {
! // try the default renderer as fallback after prefered
! renderer = Renderer.getDefaultName();
! } else {
! // try the prefered renderer as first fallback
! renderer = Renderer.getPreferedName();
! }
! if ( vid_ref.string.equals(Renderer.getDefaultName())) {
! renderer = vid_ref.string;
Com.Printf("Refresh failed\n");
gl_mode = Cvar.Get( "gl_mode", "0", 0 );
***************
*** 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);
/*
--- 275,284 ----
Cvar.SetValue("gl_mode", 0);
if ( !LoadRefresh( vid_ref.string ) )
! Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!");
} else
! Com.Error(Defines.ERR_FATAL, "Couldn't fall back to " + renderer +" refresh!");
}
! Cvar.Set("vid_ref", renderer);
/*
|
