Refactoring patch by DevHC

This commit is contained in:
Thilo Schulz 2011-03-05 19:20:37 +00:00
parent 21668c0616
commit fef4d12d68
31 changed files with 60 additions and 98 deletions

View file

@ -286,7 +286,7 @@ vidmode_t r_vidModes[] =
{ "Mode 10: 2048x1536", 2048, 1536, 1 },
{ "Mode 11: 856x480 (wide)",856, 480, 1 }
};
static int s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
static int s_numVidModes = ARRAY_LEN( r_vidModes );
qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode ) {
vidmode_t *vm;

View file

@ -1062,7 +1062,6 @@ extern cvar_t *r_colorMipLevels; // development aid to see texture mip usage
extern cvar_t *r_picmip; // controls picmip values
extern cvar_t *r_finish;
extern cvar_t *r_drawBuffer;
extern cvar_t *r_glDriver;
extern cvar_t *r_swapInterval;
extern cvar_t *r_textureMode;
extern cvar_t *r_offsetFactor;
@ -1115,8 +1114,6 @@ extern cvar_t *r_saveFontData;
extern cvar_t *r_marksOnTriangleMeshes;
extern cvar_t *r_GLlibCoolDownMsec;
//====================================================================
float R_NoiseGet4f( float x, float y, float z, float t );

View file

@ -30,7 +30,6 @@ static char *s_shaderText;
static shaderStage_t stages[MAX_SHADER_STAGES];
static shader_t shader;
static texModInfo_t texMods[MAX_SHADER_STAGES][TR_MAX_TEXMODS];
static qboolean deferLoad;
#define FILE_HASH_SIZE 1024
static shader_t* hashTable[FILE_HASH_SIZE];
@ -1371,7 +1370,7 @@ surfaceparm <name>
*/
static void ParseSurfaceParm( char **text ) {
char *token;
int numInfoParms = sizeof(infoParms) / sizeof(infoParms[0]);
int numInfoParms = ARRAY_LEN( infoParms );
int i;
token = COM_ParseExt( text, qfalse );
@ -3070,8 +3069,6 @@ void R_InitShaders( void ) {
Com_Memset(hashTable, 0, sizeof(hashTable));
deferLoad = qfalse;
CreateInternalShaders();
ScanAndLoadShaderFiles();