Remove trailing spaces, convert mistakenly put spaces to tabs. The most useful commit ever.
This commit is contained in:
parent
20ecfcd8e0
commit
2f8fec6b70
45 changed files with 102 additions and 102 deletions
|
@ -172,7 +172,7 @@ typedef struct cl_enginefuncs_s
|
||||||
int (*GetMaxClients)( void );
|
int (*GetMaxClients)( void );
|
||||||
void (*Cvar_SetValue)( const char *cvar, float value );
|
void (*Cvar_SetValue)( const char *cvar, float value );
|
||||||
|
|
||||||
int (*Cmd_Argc)( void );
|
int (*Cmd_Argc)( void );
|
||||||
const char *(*Cmd_Argv)( int arg );
|
const char *(*Cmd_Argv)( int arg );
|
||||||
void (*Con_Printf)( const char *fmt, ... );
|
void (*Con_Printf)( const char *fmt, ... );
|
||||||
void (*Con_DPrintf)( const char *fmt, ... );
|
void (*Con_DPrintf)( const char *fmt, ... );
|
||||||
|
|
|
@ -1187,7 +1187,7 @@ int CL_GetDemoComment( const char *demoname, char *comment )
|
||||||
{
|
{
|
||||||
Q_strncpy( comment, "", MAX_STRING );
|
Q_strncpy( comment, "", MAX_STRING );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// read in the m_DemoHeader
|
// read in the m_DemoHeader
|
||||||
FS_Read( demfile, &demohdr, sizeof( demoheader_t ));
|
FS_Read( demfile, &demohdr, sizeof( demoheader_t ));
|
||||||
|
|
|
@ -1541,7 +1541,7 @@ static client_sprite_t *pfnSPR_GetList( char *psz, int *piCount )
|
||||||
{
|
{
|
||||||
Con_Printf( S_ERROR "SPR_GetList: overflow cache!\n" );
|
Con_Printf( S_ERROR "SPR_GetList: overflow cache!\n" );
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !clgame.itemspath[0] ) // typically it's sprites\*.txt
|
if( !clgame.itemspath[0] ) // typically it's sprites\*.txt
|
||||||
COM_ExtractFilePath( psz, clgame.itemspath );
|
COM_ExtractFilePath( psz, clgame.itemspath );
|
||||||
|
@ -3456,7 +3456,7 @@ void NetAPI_CancelRequest( int context )
|
||||||
SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
|
SetBits( nr->resp.error, NET_ERROR_TIMEOUT );
|
||||||
nr->resp.ping = host.realtime - nr->timesend;
|
nr->resp.ping = host.realtime - nr->timesend;
|
||||||
nr->pfnFunc( &nr->resp );
|
nr->pfnFunc( &nr->resp );
|
||||||
}
|
|
||||||
|
|
||||||
if( clgame.net_requests[i].resp.type == NETAPI_REQUEST_SERVERLIST && &clgame.net_requests[i] == clgame.master_request )
|
if( clgame.net_requests[i].resp.type == NETAPI_REQUEST_SERVERLIST && &clgame.net_requests[i] == clgame.master_request )
|
||||||
{
|
{
|
||||||
|
@ -4006,7 +4006,7 @@ qboolean CL_LoadProgs( const char *name )
|
||||||
// functions are cleared before all the extensions are evaluated
|
// functions are cleared before all the extensions are evaluated
|
||||||
if(( *func->func = (void *)COM_GetProcAddress( clgame.hInstance, func->name )) == NULL )
|
if(( *func->func = (void *)COM_GetProcAddress( clgame.hInstance, func->name )) == NULL )
|
||||||
{
|
{
|
||||||
Con_Reportf( "CL_LoadProgs: failed to get address of %s proc\n", func->name );
|
Con_Reportf( "CL_LoadProgs: failed to get address of %s proc\n", func->name );
|
||||||
|
|
||||||
if( critical_exports )
|
if( critical_exports )
|
||||||
{
|
{
|
||||||
|
|
|
@ -95,7 +95,7 @@ void SCR_DrawFPS( int height )
|
||||||
Q_snprintf( fpsstring, sizeof( fpsstring ), "fps: ^1%4i min, ^3%4i cur, ^2%4i max", minfps, curfps, maxfps );
|
Q_snprintf( fpsstring, sizeof( fpsstring ), "fps: ^1%4i min, ^3%4i cur, ^2%4i max", minfps, curfps, maxfps );
|
||||||
else Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i fps", curfps );
|
else Q_snprintf( fpsstring, sizeof( fpsstring ), "%4i fps", curfps );
|
||||||
MakeRGBA( color, 255, 255, 255, 255 );
|
MakeRGBA( color, 255, 255, 255, 255 );
|
||||||
}
|
}
|
||||||
|
|
||||||
Con_DrawStringLen( fpsstring, &offset, NULL );
|
Con_DrawStringLen( fpsstring, &offset, NULL );
|
||||||
Con_DrawString( refState.width - offset - 4, height, fpsstring, color );
|
Con_DrawString( refState.width - offset - 4, height, fpsstring, color );
|
||||||
|
|
|
@ -415,7 +415,7 @@ void DLY_DoStereoDelay( int count )
|
||||||
{
|
{
|
||||||
// clear delay line
|
// clear delay line
|
||||||
dly->lpdelayline[dly->idelayinput] = 0;
|
dly->lpdelayline[dly->idelayinput] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
DLY_MovePointer( dly );
|
DLY_MovePointer( dly );
|
||||||
}
|
}
|
||||||
|
|
|
@ -1183,8 +1183,8 @@ static void Cmd_Apropos_f( void )
|
||||||
// fix inconsistencies in output from different commands
|
// fix inconsistencies in output from different commands
|
||||||
Msg( "cvar ^3%s^7 is \"%s\" [\"%s\"] %s\n",
|
Msg( "cvar ^3%s^7 is \"%s\" [\"%s\"] %s\n",
|
||||||
var->name, var->string,
|
var->name, var->string,
|
||||||
( var->flags & FCVAR_EXTENDED ) ? var->def_string : "",
|
( var->flags & FCVAR_EXTENDED ) ? var->def_string : "",
|
||||||
( var->flags & FCVAR_EXTENDED ) ? var->desc : "game cvar");
|
( var->flags & FCVAR_EXTENDED ) ? var->desc : "game cvar");
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -950,7 +950,7 @@ qboolean Cmd_CheckMapsList_R( qboolean fRefresh, qboolean onlyingamedir )
|
||||||
|
|
||||||
if( !size )
|
if( !size )
|
||||||
{
|
{
|
||||||
if( buffer ) Mem_Free( buffer );
|
if( buffer ) Mem_Free( buffer );
|
||||||
|
|
||||||
if( onlyingamedir )
|
if( onlyingamedir )
|
||||||
return Cmd_CheckMapsList_R( fRefresh, false );
|
return Cmd_CheckMapsList_R( fRefresh, false );
|
||||||
|
@ -960,7 +960,7 @@ qboolean Cmd_CheckMapsList_R( qboolean fRefresh, qboolean onlyingamedir )
|
||||||
// write generated maps.lst
|
// write generated maps.lst
|
||||||
if( FS_WriteFile( "maps.lst", buffer, Q_strlen( buffer )))
|
if( FS_WriteFile( "maps.lst", buffer, Q_strlen( buffer )))
|
||||||
{
|
{
|
||||||
if( buffer ) Mem_Free( buffer );
|
if( buffer ) Mem_Free( buffer );
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -214,8 +214,8 @@ qboolean Image_LoadPNG( const char *name, const byte *buffer, fs_offset_t filesi
|
||||||
switch( png_hdr.ihdr_chunk.colortype )
|
switch( png_hdr.ihdr_chunk.colortype )
|
||||||
{
|
{
|
||||||
case PNG_CT_RGB:
|
case PNG_CT_RGB:
|
||||||
pixel_size = 3;
|
pixel_size = 3;
|
||||||
break;
|
break;
|
||||||
case PNG_CT_RGBA:
|
case PNG_CT_RGBA:
|
||||||
pixel_size = 4;
|
pixel_size = 4;
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -482,7 +482,7 @@ qboolean Image_LoadMIP( const char *name, const byte *buffer, fs_offset_t filesi
|
||||||
|
|
||||||
// check for half-life water texture
|
// check for half-life water texture
|
||||||
if( hl_texture && ( mip.name[0] == '!' || !Q_strnicmp( mip.name, "water", 5 )))
|
if( hl_texture && ( mip.name[0] == '!' || !Q_strnicmp( mip.name, "water", 5 )))
|
||||||
{
|
{
|
||||||
// grab the fog color
|
// grab the fog color
|
||||||
image.fogParams[0] = pal[3*3+0];
|
image.fogParams[0] = pal[3*3+0];
|
||||||
image.fogParams[1] = pal[3*3+1];
|
image.fogParams[1] = pal[3*3+1];
|
||||||
|
@ -490,9 +490,9 @@ qboolean Image_LoadMIP( const char *name, const byte *buffer, fs_offset_t filesi
|
||||||
|
|
||||||
// grab the fog density
|
// grab the fog density
|
||||||
image.fogParams[3] = pal[4*3+0];
|
image.fogParams[3] = pal[4*3+0];
|
||||||
}
|
}
|
||||||
else if( hl_texture && ( rendermode == LUMP_GRADIENT ))
|
else if( hl_texture && ( rendermode == LUMP_GRADIENT ))
|
||||||
{
|
{
|
||||||
// grab the decal color
|
// grab the decal color
|
||||||
image.fogParams[0] = pal[255*3+0];
|
image.fogParams[0] = pal[255*3+0];
|
||||||
image.fogParams[1] = pal[255*3+1];
|
image.fogParams[1] = pal[255*3+1];
|
||||||
|
|
|
@ -2539,7 +2539,7 @@ static void Mod_LoadLeafs( dbspmodel_t *bmod )
|
||||||
out->compressed_vis = loadmodel->visdata + p;
|
out->compressed_vis = loadmodel->visdata + p;
|
||||||
else Con_Reportf( S_WARN "Mod_LoadLeafs: invalid visofs for leaf #%i\n", i );
|
else Con_Reportf( S_WARN "Mod_LoadLeafs: invalid visofs for leaf #%i\n", i );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else out->cluster = -1; // no visclusters on bmodels
|
else out->cluster = -1; // no visclusters on bmodels
|
||||||
|
|
||||||
if( p == -1 ) out->compressed_vis = NULL;
|
if( p == -1 ) out->compressed_vis = NULL;
|
||||||
|
|
|
@ -1792,7 +1792,7 @@ qboolean MSG_ReadDeltaEntity( sizebuf_t *msg, entity_state_t *from, entity_state
|
||||||
{
|
{
|
||||||
// removed from delta-message
|
// removed from delta-message
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( fRemoveType & 2 )
|
if( fRemoveType & 2 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -591,7 +591,7 @@ int PM_TestPlayerPosition( playermove_t *pmove, vec3_t pos, pmtrace_t *ptrace, p
|
||||||
{
|
{
|
||||||
if(( check_angles( pe->angles[0] ) || check_angles( pe->angles[2] )) && pmove->usehull != 2 )
|
if(( check_angles( pe->angles[0] ) || check_angles( pe->angles[2] )) && pmove->usehull != 2 )
|
||||||
transform_bbox = true;
|
transform_bbox = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( transform_bbox )
|
if( transform_bbox )
|
||||||
Matrix4x4_CreateFromEntity( matrix, pe->angles, pe->origin, 1.0f );
|
Matrix4x4_CreateFromEntity( matrix, pe->angles, pe->origin, 1.0f );
|
||||||
|
|
|
@ -269,8 +269,8 @@ void Sys_SendKeyEvents( void )
|
||||||
if( !GetMessage( &msg, NULL, 0, 0 ))
|
if( !GetMessage( &msg, NULL, 0, 0 ))
|
||||||
Sys_Quit ();
|
Sys_Quit ();
|
||||||
|
|
||||||
TranslateMessage( &msg );
|
TranslateMessage( &msg );
|
||||||
DispatchMessage( &msg );
|
DispatchMessage( &msg );
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -317,7 +317,7 @@ qboolean Sys_LoadLibrary( dll_info_t *dll )
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Con_Reportf( " - ok\n" );
|
Con_Reportf( " - ok\n" );
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
error:
|
error:
|
||||||
|
|
|
@ -78,7 +78,7 @@ typedef struct ui_enginefuncs_s
|
||||||
int (*pfnAddCommand)( const char *cmd_name, void (*function)(void) );
|
int (*pfnAddCommand)( const char *cmd_name, void (*function)(void) );
|
||||||
void (*pfnClientCmd)( int execute_now, const char *szCmdString );
|
void (*pfnClientCmd)( int execute_now, const char *szCmdString );
|
||||||
void (*pfnDelCommand)( const char *cmd_name );
|
void (*pfnDelCommand)( const char *cmd_name );
|
||||||
int (*pfnCmdArgc)( void );
|
int (*pfnCmdArgc)( void );
|
||||||
const char* (*pfnCmdArgv)( int argc );
|
const char* (*pfnCmdArgv)( int argc );
|
||||||
const char* (*pfnCmd_Args)( void );
|
const char* (*pfnCmd_Args)( void );
|
||||||
|
|
||||||
|
|
|
@ -402,7 +402,7 @@ void* GL_GetProcAddress( const char *name ) // RenderAPI requirement
|
||||||
return eglGetProcAddress( name );
|
return eglGetProcAddress( name );
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL_UpdateSwapInterval( void )
|
void GL_UpdateSwapInterval( void )
|
||||||
{
|
{
|
||||||
// disable VSync while level is loading
|
// disable VSync while level is loading
|
||||||
if( cls.state < ca_active )
|
if( cls.state < ca_active )
|
||||||
|
|
|
@ -404,7 +404,7 @@ void Wcon_DestroyConsole( void )
|
||||||
if( s_wcd.hWnd )
|
if( s_wcd.hWnd )
|
||||||
{
|
{
|
||||||
DeleteObject( s_wcd.hbrEditBackground );
|
DeleteObject( s_wcd.hbrEditBackground );
|
||||||
DeleteObject( s_wcd.hfBufferFont );
|
DeleteObject( s_wcd.hfBufferFont );
|
||||||
|
|
||||||
if( host.type == HOST_DEDICATED )
|
if( host.type == HOST_DEDICATED )
|
||||||
{
|
{
|
||||||
|
|
|
@ -209,7 +209,7 @@ typedef struct sv_client_s
|
||||||
char physinfo[MAX_INFO_STRING]; // set on server (transmit to client)
|
char physinfo[MAX_INFO_STRING]; // set on server (transmit to client)
|
||||||
|
|
||||||
netchan_t netchan;
|
netchan_t netchan;
|
||||||
int chokecount; // number of messages rate supressed
|
int chokecount; // number of messages rate supressed
|
||||||
int delta_sequence; // -1 = no compression.
|
int delta_sequence; // -1 = no compression.
|
||||||
|
|
||||||
double next_messagetime; // time when we should send next world state update
|
double next_messagetime; // time when we should send next world state update
|
||||||
|
|
|
@ -2286,14 +2286,14 @@ static void pfnTraceModel( const float *v1, const float *v2, int hullNumber, edi
|
||||||
pent->v.movetype = MOVETYPE_PUSH;
|
pent->v.movetype = MOVETYPE_PUSH;
|
||||||
pent->v.solid = SOLID_BSP;
|
pent->v.solid = SOLID_BSP;
|
||||||
|
|
||||||
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace );
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace );
|
||||||
|
|
||||||
pent->v.movetype = oldmovetype;
|
pent->v.movetype = oldmovetype;
|
||||||
pent->v.solid = oldsolid;
|
pent->v.solid = oldsolid;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace );
|
SV_ClipMoveToEntity( pent, v1, mins, maxs, v2, &trace );
|
||||||
}
|
}
|
||||||
|
|
||||||
SV_ConvertTrace( ptr, &trace );
|
SV_ConvertTrace( ptr, &trace );
|
||||||
|
@ -2368,7 +2368,7 @@ void pfnGetAimVector( edict_t* ent, float speed, float *rgflReturn )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( FBitSet( check->v.flags, FL_FAKECLIENT ))
|
if( FBitSet( check->v.flags, FL_FAKECLIENT ))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( ent->v.team > 0 && ent->v.team == check->v.team )
|
if( ent->v.team > 0 && ent->v.team == check->v.team )
|
||||||
continue;
|
continue;
|
||||||
|
@ -4006,7 +4006,7 @@ void SV_PlaybackEventFull( int flags, const edict_t *pInvoker, word eventindex,
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !FBitSet( flags, FEV_GLOBAL ) && VectorIsNull( pvspoint ))
|
if( !FBitSet( flags, FEV_GLOBAL ) && VectorIsNull( pvspoint ))
|
||||||
{
|
{
|
||||||
Con_DPrintf( S_ERROR "%s: not a FEV_GLOBAL event missing origin. Ignored.\n", sv.event_precache[eventindex] );
|
Con_DPrintf( S_ERROR "%s: not a FEV_GLOBAL event missing origin. Ignored.\n", sv.event_precache[eventindex] );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -5053,7 +5053,7 @@ qboolean SV_LoadProgs( const char *name )
|
||||||
if( !GetEntityAPI && !GetEntityAPI2 )
|
if( !GetEntityAPI && !GetEntityAPI2 )
|
||||||
{
|
{
|
||||||
COM_FreeLibrary( svgame.hInstance );
|
COM_FreeLibrary( svgame.hInstance );
|
||||||
Con_Printf( S_ERROR "SV_LoadProgs: failed to get address of GetEntityAPI proc\n" );
|
Con_Printf( S_ERROR "SV_LoadProgs: failed to get address of GetEntityAPI proc\n" );
|
||||||
svgame.hInstance = NULL;
|
svgame.hInstance = NULL;
|
||||||
Mem_FreePool(&svgame.mempool);
|
Mem_FreePool(&svgame.mempool);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -479,7 +479,7 @@ void SV_CheckTimeouts( void )
|
||||||
{
|
{
|
||||||
if( cl->edict && !FBitSet( cl->edict->v.flags, FL_SPECTATOR|FL_FAKECLIENT ))
|
if( cl->edict && !FBitSet( cl->edict->v.flags, FL_SPECTATOR|FL_FAKECLIENT ))
|
||||||
numclients++;
|
numclients++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// fake clients do not timeout
|
// fake clients do not timeout
|
||||||
if( FBitSet( cl->flags, FCL_FAKECLIENT ))
|
if( FBitSet( cl->flags, FCL_FAKECLIENT ))
|
||||||
|
|
|
@ -609,8 +609,8 @@ int SV_FlyMove( edict_t *ent, float time, trace_t *steptrace )
|
||||||
{
|
{
|
||||||
blocked |= 1; // floor
|
blocked |= 1; // floor
|
||||||
|
|
||||||
if( trace.ent->v.solid == SOLID_BSP || trace.ent->v.solid == SOLID_SLIDEBOX ||
|
if( trace.ent->v.solid == SOLID_BSP || trace.ent->v.solid == SOLID_SLIDEBOX ||
|
||||||
trace.ent->v.movetype == MOVETYPE_PUSHSTEP || (trace.ent->v.flags & FL_CLIENT))
|
trace.ent->v.movetype == MOVETYPE_PUSHSTEP || (trace.ent->v.flags & FL_CLIENT))
|
||||||
{
|
{
|
||||||
SetBits( ent->v.flags, FL_ONGROUND );
|
SetBits( ent->v.flags, FL_ONGROUND );
|
||||||
ent->v.groundentity = trace.ent;
|
ent->v.groundentity = trace.ent;
|
||||||
|
@ -866,7 +866,7 @@ allow entity to block pusher?
|
||||||
static qboolean SV_CanBlock( edict_t *ent )
|
static qboolean SV_CanBlock( edict_t *ent )
|
||||||
{
|
{
|
||||||
if( ent->v.mins[0] == ent->v.maxs[0] )
|
if( ent->v.mins[0] == ent->v.maxs[0] )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if( ent->v.solid == SOLID_NOT || ent->v.solid == SOLID_TRIGGER )
|
if( ent->v.solid == SOLID_NOT || ent->v.solid == SOLID_TRIGGER )
|
||||||
{
|
{
|
||||||
|
@ -874,7 +874,7 @@ static qboolean SV_CanBlock( edict_t *ent )
|
||||||
ent->v.mins[0] = ent->v.mins[1] = 0;
|
ent->v.mins[0] = ent->v.mins[1] = 0;
|
||||||
VectorCopy( ent->v.mins, ent->v.maxs );
|
VectorCopy( ent->v.mins, ent->v.maxs );
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1098,7 +1098,7 @@ static edict_t *SV_PushRotate( edict_t *pusher, float movetime )
|
||||||
if( lmove[2] != 0.0f ) check->v.flags &= ~FL_ONGROUND;
|
if( lmove[2] != 0.0f ) check->v.flags &= ~FL_ONGROUND;
|
||||||
if( lmove[2] < 0.0f && !pusher->v.dmg )
|
if( lmove[2] < 0.0f && !pusher->v.dmg )
|
||||||
lmove[2] = 0.0f; // let's the free falling
|
lmove[2] = 0.0f; // let's the free falling
|
||||||
}
|
}
|
||||||
|
|
||||||
// try moving the contacted entity
|
// try moving the contacted entity
|
||||||
pusher->v.solid = SOLID_NOT;
|
pusher->v.solid = SOLID_NOT;
|
||||||
|
@ -1795,7 +1795,7 @@ void SV_Physics( void )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if( i > 0 && i <= svs.maxclients )
|
if( i > 0 && i <= svs.maxclients )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
SV_Physics_Entity( ent );
|
SV_Physics_Entity( ent );
|
||||||
}
|
}
|
||||||
|
|
|
@ -183,8 +183,8 @@ size_t Q_strncpy( char *dst, const char *src, size_t size )
|
||||||
|
|
||||||
int Q_atoi( const char *str )
|
int Q_atoi( const char *str )
|
||||||
{
|
{
|
||||||
int val = 0;
|
int val = 0;
|
||||||
int c, sign;
|
int c, sign;
|
||||||
|
|
||||||
if( !str ) return 0;
|
if( !str ) return 0;
|
||||||
|
|
||||||
|
@ -361,7 +361,7 @@ int Q_strnicmp( const char *s1, const char *s2, int n )
|
||||||
else if( s2 == NULL )
|
else if( s2 == NULL )
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
c1 = *s1++;
|
c1 = *s1++;
|
||||||
|
|
|
@ -133,7 +133,7 @@ void RoundUpHullSize( vec3_t size )
|
||||||
for( i = 0; i < 3; i++)
|
for( i = 0; i < 3; i++)
|
||||||
{
|
{
|
||||||
qboolean negative = false;
|
qboolean negative = false;
|
||||||
float result, value;
|
float result, value;
|
||||||
|
|
||||||
value = size[i];
|
value = size[i];
|
||||||
if( value < 0.0f ) negative = true;
|
if( value < 0.0f ) negative = true;
|
||||||
|
@ -142,7 +142,7 @@ void RoundUpHullSize( vec3_t size )
|
||||||
|
|
||||||
// lookup hull table to find nearest supposed value
|
// lookup hull table to find nearest supposed value
|
||||||
for( j = 0; j < NUM_HULL_ROUNDS; j++ )
|
for( j = 0; j < NUM_HULL_ROUNDS; j++ )
|
||||||
{
|
{
|
||||||
if( value > hull_table[j] )
|
if( value > hull_table[j] )
|
||||||
continue; // ceil only
|
continue; // ceil only
|
||||||
|
|
||||||
|
|
|
@ -1047,7 +1047,7 @@ void GL_DrawAliasFrame( aliashdr_t *paliashdr )
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
pglBegin( GL_TRIANGLE_STRIP );
|
pglBegin( GL_TRIANGLE_STRIP );
|
||||||
}
|
}
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
|
|
@ -95,11 +95,11 @@ void Mod_BrushUnloadTextures( model_t *mod )
|
||||||
{
|
{
|
||||||
texture_t *tx = mod->textures[i];
|
texture_t *tx = mod->textures[i];
|
||||||
if( !tx || tx->gl_texturenum == tr.defaultTexture )
|
if( !tx || tx->gl_texturenum == tr.defaultTexture )
|
||||||
continue; // free slot
|
continue; // free slot
|
||||||
|
|
||||||
GL_FreeTexture( tx->gl_texturenum ); // main texture
|
GL_FreeTexture( tx->gl_texturenum ); // main texture
|
||||||
GL_FreeTexture( tx->fb_texturenum ); // luma texture
|
GL_FreeTexture( tx->fb_texturenum ); // luma texture
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mod_UnloadTextures( model_t *mod )
|
void Mod_UnloadTextures( model_t *mod )
|
||||||
|
|
|
@ -1103,7 +1103,7 @@ void R_RenderDetails( void )
|
||||||
fa = p->surf;
|
fa = p->surf;
|
||||||
glt = R_GetTexture( fa->texinfo->texture->gl_texturenum ); // get texture scale
|
glt = R_GetTexture( fa->texinfo->texture->gl_texturenum ); // get texture scale
|
||||||
DrawGLPoly( fa->polys, glt->xscale, glt->yscale );
|
DrawGLPoly( fa->polys, glt->xscale, glt->yscale );
|
||||||
}
|
}
|
||||||
|
|
||||||
detail_surfaces[i] = NULL;
|
detail_surfaces[i] = NULL;
|
||||||
es->detailchain = NULL;
|
es->detailchain = NULL;
|
||||||
|
|
|
@ -745,7 +745,7 @@ static void R_DrawSpriteQuad( mspriteframe_t *frame, vec3_t org, vec3_t v_right,
|
||||||
VectorMA( org, frame->up * scale, v_up, point );
|
VectorMA( org, frame->up * scale, v_up, point );
|
||||||
VectorMA( point, frame->right * scale, v_right, point );
|
VectorMA( point, frame->right * scale, v_right, point );
|
||||||
pglVertex3fv( point );
|
pglVertex3fv( point );
|
||||||
pglTexCoord2f( 1.0f, 1.0f );
|
pglTexCoord2f( 1.0f, 1.0f );
|
||||||
VectorMA( org, frame->down * scale, v_up, point );
|
VectorMA( org, frame->down * scale, v_up, point );
|
||||||
VectorMA( point, frame->right * scale, v_right, point );
|
VectorMA( point, frame->right * scale, v_right, point );
|
||||||
pglVertex3fv( point );
|
pglVertex3fv( point );
|
||||||
|
|
Loading…
Add table
Reference in a new issue