rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-22 04:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Apparently Suislide was a dick. No mention of him here then

Browse source
This commit is contained in:
Richard Allen 2012-03-30 10:29:49 +00:00
parent 9363feb0ca
commit 2f7dd942ba
3 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/code/client/cl_main.c
View file

@ -3552,7 +3552,7 @@ void CL_Init( void ) {
cl_consoleKeys = Cvar_Get( "cl_consoleKeys", "~ ` 0x7e 0x60", CVAR_ARCHIVE);
// userinfo
Cvar_Get ("name", "Suislide", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("name", "Al Leong", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("rate", "25000", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("snaps", "20", CVAR_USERINFO | CVAR_ARCHIVE );
Cvar_Get ("model", "reactionmale", CVAR_USERINFO | CVAR_ARCHIVE );

54
reaction/code/renderer/tr_init.c
View file

@ -523,17 +523,17 @@ void R_TakeScreenshot( int x, int y, int width, int height, char *name, qboolean
/*
==================
R_ScreenshotFilename
R_ScreenshotFilenameEx
==================
*/
void R_ScreenshotFilename( int lastNumber, char *fileName ) {
void R_ScreenshotFilenameEx( const char* extension, int lastNumber, char *fileName ) {
int a,b,c,d;
qtime_t now;
if ( lastNumber < 0 || lastNumber > 9999 ) {
Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.tga" );
return;
lastNumber = 9999;
}
a = lastNumber / 1000;
lastNumber -= a*1000;
b = lastNumber / 100;
@ -542,33 +542,31 @@ void R_ScreenshotFilename( int lastNumber, char *fileName ) {
lastNumber -= c*10;
d = lastNumber;
Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.tga"
, a, b, c, d );
Com_RealTime(&now);
Com_sprintf( fileName, MAX_OSPATH, "screenshots/" PRODUCT_NAME "-%04i%02i%02i-%02i%02i%02i-%i%i%i%i.%s",
now.tm_year + 1900, now.tm_mon + 1, now.tm_mday,
now.tm_hour, now.tm_min, now.tm_sec,
a, b, c, d, extension );
}
/*
==================
R_ScreenshotFilename
==================
*/
void R_ScreenshotFilename( int lastNumber, char *fileName ) {
R_ScreenshotFilenameEx("tga", lastNumber, fileName);
}
/*
==================
R_ScreenshotFilenameJPEG
==================
*/
void R_ScreenshotFilenameJPEG( int lastNumber, char *fileName ) {
int a,b,c,d;
if ( lastNumber < 0 || lastNumber > 9999 ) {
Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot9999.jpg" );
return;
}
a = lastNumber / 1000;
lastNumber -= a*1000;
b = lastNumber / 100;
lastNumber -= b*100;
c = lastNumber / 10;
lastNumber -= c*10;
d = lastNumber;
Com_sprintf( fileName, MAX_OSPATH, "screenshots/shot%i%i%i%i.jpg"
, a, b, c, d );
R_ScreenshotFilenameEx("jpg", lastNumber, fileName);
}
/*
@ -682,10 +680,10 @@ void R_ScreenShot_f (void) {
for ( ; lastNumber <= 9999 ; lastNumber++ ) {
R_ScreenshotFilename( lastNumber, checkname );
if (!ri.FS_FileExists( checkname ))
{
break; // file doesn't exist
}
if (!ri.FS_FileExists( checkname ))
{
break; // file doesn't exist
}
}
if ( lastNumber >= 9999 ) {

2
reaction/code/ui/ui_main.c
View file

@ -9617,7 +9617,7 @@ static cvarTable_t cvarTable[] = {
{&ui_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE},
{&ui_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE},
//Makro - changed from Sarge
{&ui_findPlayer, "ui_findPlayer", "Suislide", CVAR_ARCHIVE},
{&ui_findPlayer, "ui_findPlayer", "Al Leong", CVAR_ARCHIVE},
//Makro - adding CVAR_ROM
{&ui_Q3Model, "ui_q3model", "1", CVAR_ARCHIVE | CVAR_ROM},
{&ui_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE},