fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-11 02:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_vidsdl.c: remove "modedesc" from vmode_t

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@802 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2013-02-11 18:03:14 +00:00
parent 102c1da6be
commit 7fe99ff949
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Quake/gl_vidsdl.c
View file

@ -48,7 +48,6 @@ typedef struct {
int modenum; int modenum;
int fullscreen; int fullscreen;
int bpp; int bpp;
char modedesc[17];
} vmode_t; } vmode_t;
static const char *gl_vendor; static const char *gl_vendor;
@ -275,7 +274,10 @@ static int VID_SetMode (int modenum)
// fix the leftover Alt from any Alt-Tab or the like that switched us away // fix the leftover Alt from any Alt-Tab or the like that switched us away
ClearAllStates (); ClearAllStates ();
Con_SafePrintf ("Video mode %s initialized\n", modelist[modenum].modedesc); Con_SafePrintf ("Video mode %dx%dx%d initialized\n",
modelist[modenum].width,
modelist[modenum].height,
modelist[modenum].bpp);
vid.recalc_refdef = 1; vid.recalc_refdef = 1;
@ -350,10 +352,6 @@ static void VID_Restart (void)
modelist[0].width = (int)vid_width.value; modelist[0].width = (int)vid_width.value;
modelist[0].height = (int)vid_height.value; modelist[0].height = (int)vid_height.value;
sprintf (modelist[0].modedesc, "%dx%dx%d",
modelist[0].width,
modelist[0].height,
modelist[0].bpp);
windowed = true; windowed = true;
vid_default = 0; vid_default = 0;
@ -801,12 +799,11 @@ static void VID_DescribeCurrentMode_f (void)
{ {
if (vid_modenum >= 0 && vid_modenum < nummodes) if (vid_modenum >= 0 && vid_modenum < nummodes)
{ {
if (modelist[vid_modenum].type == MODE_FULLSCREEN_DEFAULT) Con_Printf("%dx%dx%d %s\n",
Con_Printf("%s fullscreen\n", modelist[vid_modenum].modedesc); modelist[vid_modenum].width,
else if (modestate == MODE_WINDOWED) modelist[vid_modenum].height,
Con_Printf("%s windowed\n", modelist[vid_modenum].modedesc); modelist[vid_modenum].bpp,
else (modelist[vid_modenum].type == MODE_FULLSCREEN_DEFAULT) ? "fullscreen" : "windowed");
Con_Printf("windowed\n");
} }
} }
@ -886,11 +883,6 @@ static void VID_InitDIB (void)
info = SDL_GetVideoInfo(); info = SDL_GetVideoInfo();
modelist[0].bpp = info->vfmt->BitsPerPixel; modelist[0].bpp = info->vfmt->BitsPerPixel;
sprintf (modelist[0].modedesc, "%dx%dx%d", //johnfitz -- added bpp
modelist[0].width,
modelist[0].height,
modelist[0].bpp); //johnfitz -- added bpp
modelist[0].modenum = MODE_WINDOWED; modelist[0].modenum = MODE_WINDOWED;
modelist[0].fullscreen = 0; modelist[0].fullscreen = 0;
@ -939,11 +931,6 @@ static void VID_InitFullDIB (void)
modelist[nummodes].fullscreen = 1; modelist[nummodes].fullscreen = 1;
modelist[nummodes].bpp = bpps[i]; modelist[nummodes].bpp = bpps[i];
sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
modelist[nummodes].width,
modelist[nummodes].height,
modelist[nummodes].bpp);
for (k=originalnummodes, existingmode = 0 ; k < nummodes ; k++) for (k=originalnummodes, existingmode = 0 ; k < nummodes ; k++)
{ {
if ((modelist[nummodes].width == modelist[k].width) && if ((modelist[nummodes].width == modelist[k].width) &&
@ -1083,10 +1070,6 @@ void VID_Init (void)
modelist[nummodes].modenum = 0; modelist[nummodes].modenum = 0;
modelist[nummodes].fullscreen = 1; modelist[nummodes].fullscreen = 1;
modelist[nummodes].bpp = bpp; modelist[nummodes].bpp = bpp;
sprintf (modelist[nummodes].modedesc, "%dx%dx%d",
modelist[nummodes].width,
modelist[nummodes].height,
modelist[nummodes].bpp);
for (i=nummodes, existingmode = 0 ; i<nummodes ; i++) for (i=nummodes, existingmode = 0 ; i<nummodes ; i++)
{ {