git-svn-id: https://svn.eduke32.com/eduke32@1356 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2009-04-29 20:20:57 +00:00
parent 30a649c86f
commit d11e8789e3
2 changed files with 29 additions and 24 deletions

View file

@ -3,7 +3,7 @@
ENGINELIB=libengine.a ENGINELIB=libengine.a
EDITORLIB=libbuild.a EDITORLIB=libbuild.a
# SDLCONFIG = /usr/local/bin/sdl-config # SDLCONFIG = /usr/local/bin/sdl-config
SDLCONFIG = sdl-config SDLCONFIG = sdl-config
ifeq ($(wildcard $(SDLCONFIG)),$(SDLCONFIG)) ifeq ($(wildcard $(SDLCONFIG)),$(SDLCONFIG))

View file

@ -5887,31 +5887,36 @@ static int32_t osdcmd_cvar_set_polymost(const osdfuncparm_t *parm)
{ {
int32_t r = osdcmd_cvar_set(parm); int32_t r = osdcmd_cvar_set(parm);
#ifdef USE_OPENGL if (xdim == 0 || ydim == 0 || bpp == 0) // video not set up yet
if (!Bstrcasecmp(parm->name, "r_swapinterval"))
{
setvsync(vsync);
return r; return r;
}
else if (!Bstrcasecmp(parm->name, "r_downsize"))
{
invalidatecache();
resetvideomode();
if (setgamemode(fullscreen,xdim,ydim,bpp))
OSD_Printf("restartvid: Reset failed...\n");
return r;
}
else if (!Bstrcasecmp(parm->name, "r_textureanisotropy"))
{
gltexapplyprops();
return r;
}
else if (!Bstrcasecmp(parm->name, "r_texturemode"))
{
gltexturemode(parm);
return r;
}
#ifdef USE_OPENGL
if (r == OSDCMD_OK)
{
if (!Bstrcasecmp(parm->name, "r_swapinterval"))
{
setvsync(vsync);
return r;
}
else if (!Bstrcasecmp(parm->name, "r_downsize"))
{
invalidatecache();
resetvideomode();
if (setgamemode(fullscreen,xdim,ydim,bpp))
OSD_Printf("restartvid: Reset failed...\n");
return r;
}
else if (!Bstrcasecmp(parm->name, "r_textureanisotropy"))
{
gltexapplyprops();
return r;
}
else if (!Bstrcasecmp(parm->name, "r_texturemode"))
{
gltexturemode(parm);
return r;
}
}
#endif #endif
return r; return r;
} }