From 958b99a4c446c2ba61aaf7cfaef270348a0f878c Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 31 Oct 2024 01:50:50 +0500 Subject: [PATCH] fix si->implicitImagePath extension presence vagueness added in c3437b783381753cf69f1cf8495f1244d260bdec closes #220 --- tools/quake3/q3map2/shaders.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/quake3/q3map2/shaders.cpp b/tools/quake3/q3map2/shaders.cpp index 557247d8..25c8cc09 100644 --- a/tools/quake3/q3map2/shaders.cpp +++ b/tools/quake3/q3map2/shaders.cpp @@ -373,7 +373,7 @@ const shaderInfo_t *CustomShader( const shaderInfo_t *si, const char *find, char "\t}\n" "\tq3map_styleMarker\n" "\t{\n" - "\t\tmap %s\n" + "\t\tmap %s.tga\n" "\t\tblendFunc GL_DST_COLOR GL_ZERO\n" "\t\trgbGen identity\n" "\t}\n" @@ -388,7 +388,7 @@ const shaderInfo_t *CustomShader( const shaderInfo_t *si, const char *find, char "{ // Q3Map2 defaulted (implicitMask)\n" "\tcull none\n" "\t{\n" - "\t\tmap %s\n" + "\t\tmap %s.tga\n" "\t\talphaFunc GE128\n" "\t\tdepthWrite\n" "\t}\n" @@ -399,7 +399,7 @@ const shaderInfo_t *CustomShader( const shaderInfo_t *si, const char *find, char "\t}\n" "\tq3map_styleMarker\n" "\t{\n" - "\t\tmap %s\n" + "\t\tmap %s.tga\n" "\t\tblendFunc GL_DST_COLOR GL_ZERO\n" "\t\tdepthFunc equal\n" "\t\trgbGen identity\n" @@ -416,7 +416,7 @@ const shaderInfo_t *CustomShader( const shaderInfo_t *si, const char *find, char "{ // Q3Map2 defaulted (implicitBlend)\n" "\tcull none\n" "\t{\n" - "\t\tmap %s\n" + "\t\tmap %s.tga\n" "\t\tblendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA\n" "\t}\n" "\t{\n" @@ -998,7 +998,7 @@ static void ParseShaderFile( const char *filename ){ si->implicitImagePath = si->shader; } else{ - si->implicitImagePath = token; + si->implicitImagePath( PathExtensionless( token ) ); } } @@ -1009,7 +1009,7 @@ static void ParseShaderFile( const char *filename ){ si->implicitImagePath = si->shader; } else{ - si->implicitImagePath = token; + si->implicitImagePath( PathExtensionless( token ) ); } } @@ -1020,7 +1020,7 @@ static void ParseShaderFile( const char *filename ){ si->implicitImagePath = si->shader; } else{ - si->implicitImagePath = token; + si->implicitImagePath( PathExtensionless( token ) ); } }