*** empty log message ***

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1184 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-07-27 04:08:24 +00:00
parent 2146eaa094
commit 494eb0bed6
+3 -5
View File
@@ -123,7 +123,7 @@ void setfullscreen(bool enable)
}
}
void screenres(int w, int h, int bpp = 0)
void screenres(int w, int h)
{
#if !defined(WIN32) && !defined(__APPLE__)
if(initing)
@@ -131,18 +131,16 @@ void screenres(int w, int h, int bpp = 0)
#endif
scr_w = w;
scr_h = h;
if(bpp) colorbits = bpp;
#if defined(WIN32) || defined(__APPLE__)
initwarning();
#else
return;
}
SDL_Surface *surf = SDL_SetVideoMode(w, h, bpp, SDL_OPENGL|SDL_RESIZABLE|(screen->flags&SDL_FULLSCREEN));
SDL_Surface *surf = SDL_SetVideoMode(w, h, 0, SDL_OPENGL|SDL_RESIZABLE|(screen->flags&SDL_FULLSCREEN));
if(!surf) return;
screen = surf;
scr_w = screen->w;
scr_h = screen->h;
if(bpp) colorbits = bpp;
glViewport(0, 0, scr_w, scr_h);
VIRTW = scr_w*VIRTH/scr_h;
#endif
@@ -157,7 +155,7 @@ void setresdata(char *s, enet_uint32 c)
VARF(fullscreen, 0, 0, 1, setfullscreen(fullscreen!=0));
COMMAND(screenres, ARG_3INT);
COMMAND(screenres, ARG_2INT);
VARFP(gamma, 30, 100, 300,
{