Merge pull request #692 from mjunix/small-fixes

Small fixes
This commit is contained in:
Timothee "TTimo" Besset 2023-08-13 09:15:23 -05:00 committed by GitHub
commit d9d8bc1ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 8 deletions

View File

@ -449,10 +449,6 @@ eclass_t *Eclass_ForName( const char *name, qboolean has_brushes ){
} }
#endif #endif
if ( !name ) {
return eclass_bad;
}
for ( e = eclass ; e ; e = e->next ) for ( e = eclass ; e ; e = e->next )
if ( !strcmp( name, e->name ) ) { if ( !strcmp( name, e->name ) ) {
return e; return e;

View File

@ -1017,7 +1017,6 @@ static void ParseShaderFile( const char *filename ){
!Q_stricmp( token, "clampMap" ) || !Q_stricmp( token, "clampMap" ) ||
!Q_stricmp( token, "animMap" ) || !Q_stricmp( token, "animMap" ) ||
!Q_stricmp( token, "clampAnimMap" ) || !Q_stricmp( token, "clampAnimMap" ) ||
!Q_stricmp( token, "clampMap" ) ||
!Q_stricmp( token, "mapComp" ) || !Q_stricmp( token, "mapComp" ) ||
!Q_stricmp( token, "mapNoComp" ) ) { !Q_stricmp( token, "mapNoComp" ) ) {
/* skip one token for animated stages */ /* skip one token for animated stages */

View File

@ -616,7 +616,7 @@ int EdgeCompare( const void *elem1, const void *elem2 ) {
if ( d1 < d2 ) { if ( d1 < d2 ) {
return -1; return -1;
} }
if ( d2 > d1 ) { if ( d2 < d1 ) {
return 1; return 1;
} }
return 0; return 0;

View File

@ -1015,7 +1015,6 @@ static void ParseShaderFile( const char *filename ){
!Q_stricmp( token, "clampMap" ) || !Q_stricmp( token, "clampMap" ) ||
!Q_stricmp( token, "animMap" ) || !Q_stricmp( token, "animMap" ) ||
!Q_stricmp( token, "clampAnimMap" ) || !Q_stricmp( token, "clampAnimMap" ) ||
!Q_stricmp( token, "clampMap" ) ||
!Q_stricmp( token, "mapComp" ) || !Q_stricmp( token, "mapComp" ) ||
!Q_stricmp( token, "mapNoComp" ) ) { !Q_stricmp( token, "mapNoComp" ) ) {
/* skip one token for animated stages */ /* skip one token for animated stages */

View File

@ -616,7 +616,7 @@ int EdgeCompare( const void *elem1, const void *elem2 ) {
if ( d1 < d2 ) { if ( d1 < d2 ) {
return -1; return -1;
} }
if ( d2 > d1 ) { if ( d2 < d1 ) {
return 1; return 1;
} }
return 0; return 0;