Skip to content

Commit 1d93ff3

Browse files
committed
tr_image: drop the _name builtin image detection as this convention isn't used anymore
Also drop the check for / as files cannot have a * or $ in their names.
1 parent 08c8c41 commit 1d93ff3

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/engine/renderer/tr_image.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,16 +1820,12 @@ image_t *R_FindImageFile( const char *imageName, imageParams_t &imageParams )
18201820

18211821
// Built-in images can't be reloaded with different parameters, so return them as-is.
18221822
// For most of the usable ones e.g. $white, parameters wouldn't make a difference anyway.
1823-
// HACK: detect built-in images by naming convention, though nothing stops users from using such names
1823+
// Detect built-in images by naming convention.
18241824
switch ( image->name[ 0 ] )
18251825
{
1826-
case '_':
18271826
case '*':
18281827
case '$':
1829-
if ( !strchr( image->name, '/' ) )
1830-
{
1831-
return image;
1832-
}
1828+
return image;
18331829
break;
18341830
default:
18351831
break;

0 commit comments

Comments
 (0)