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

minor whitespace adjustments

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1101 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-10-11 19:11:40 +00:00
parent dddb9b82b9
commit 039fdaad6f
5 changed files with 187 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Quake/console.c
View file

@ -156,31 +156,7 @@ static void Con_Dump_f (void)
char buffer[1024]; char buffer[1024];
char name[MAX_OSPATH]; char name[MAX_OSPATH];
#if 1
//johnfitz -- there is a security risk in writing files with an arbitrary filename. so,
//until stuffcmd is crippled to alleviate this risk, just force the default filename.
q_snprintf (name, sizeof(name), "%s/condump.txt", com_gamedir); q_snprintf (name, sizeof(name), "%s/condump.txt", com_gamedir);
#else
if (Cmd_Argc() > 2)
{
Con_Printf ("usage: condump <filename>\n");
return;
}
if (Cmd_Argc() > 1)
{
if (strstr(Cmd_Argv(1), ".."))
{
Con_Printf ("Relative pathnames are not allowed.\n");
return;
}
q_snprintf (name, sizeof(name), "%s/%s", com_gamedir, Cmd_Argv(1));
COM_AddExtension (name, ".txt", sizeof(name));
}
else
q_snprintf (name, sizeof(name), "%s/condump.txt", com_gamedir);
#endif
COM_CreatePath (name); COM_CreatePath (name);
f = fopen (name, "w"); f = fopen (name, "w");
if (!f) if (!f)

8
Quake/gl_screen.c
View file

@ -69,7 +69,6 @@ console is:
half half
full full
*/ */
@ -388,6 +387,7 @@ void SCR_LoadPics (void)
scr_net = Draw_PicFromWad ("net"); scr_net = Draw_PicFromWad ("net");
scr_turtle = Draw_PicFromWad ("turtle"); scr_turtle = Draw_PicFromWad ("turtle");
} }
/* /*
================== ==================
SCR_Init SCR_Init
@ -475,7 +475,6 @@ void SCR_DrawFPS (void)
Draw_String (x, y, st); Draw_String (x, y, st);
scr_tileclear_updates = 0; scr_tileclear_updates = 0;
} }
} }
/* /*
@ -753,7 +752,7 @@ void SCR_DrawConsole (void)
/* /*
============================================================================== ==============================================================================
SCREEN SHOTS SCREEN SHOTS
============================================================================== ==============================================================================
*/ */
@ -946,7 +945,8 @@ int SCR_ModalMessage (const char *text, float timeout) //johnfitz -- timeout
/* /*
================== ==================
SCR_TileClear -- johnfitz -- modified to use glwidth/glheight instead of vid.width/vid.height SCR_TileClear
johnfitz -- modified to use glwidth/glheight instead of vid.width/vid.height
also fixed the dimentions of right and top panels also fixed the dimentions of right and top panels
also added scr_tileclear_updates also added scr_tileclear_updates
================== ==================

13
Quake/gl_vidsdl.c
View file

@ -291,7 +291,7 @@ VID_GetCurrentHeight
static int VID_GetCurrentHeight (void) static int VID_GetCurrentHeight (void)
{ {
#if defined(USE_SDL2) #if defined(USE_SDL2)
int w=0, h=0; int w = 0, h = 0;
SDL_GetWindowSize(draw_context, &w, &h); SDL_GetWindowSize(draw_context, &w, &h);
return h; return h;
#else #else
@ -481,17 +481,13 @@ static int VID_SetMode (int width, int height, int bpp, qboolean fullscreen)
CDAudio_Pause (); CDAudio_Pause ();
BGM_Pause (); BGM_Pause ();
// /* z-buffer depth */
// z-buffer depth
//
if (bpp == 16) if (bpp == 16)
depthbits = 16; depthbits = 16;
else depthbits = 24; else depthbits = 24;
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, depthbits); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, depthbits);
// /* fsaa */
// fsaa
//
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, fsaa > 0 ? 1 : 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, fsaa > 0 ? 1 : 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
@ -1101,8 +1097,6 @@ void VID_Shutdown (void)
} }
} }
//==========================================================================
/* /*
=================================================================== ===================================================================
@ -1123,7 +1117,6 @@ static void ClearAllStates (void)
} }
//========================================================================== //==========================================================================
// //
// COMMANDS // COMMANDS

1
Quake/keys.c
View file

@ -1246,3 +1246,4 @@ void Key_UpdateForDest (void)
break; break;
} }
} }