[q3map2] Unwind script stack in case of script loading error.

[xonotic/netradiant.git] / libs / shaderlib.h

diff --git a/libs/shaderlib.h b/libs/shaderlib.h
index 54057ac01b082c2521294b8aca0c4d7af7bfed67..1d9f5e0a7983216b7660f698ae2e28980b829701 100644 (file)
--- a/libs/shaderlib.h
+++ b/libs/shaderlib.h
@@ -52,19 +52,17 @@ bool operator()( const CopiedString& shader, const CopiedString& other ) const {
 
 static inline bool shader_is_diffuse( const char *shader ){
        return
-               /* Quake2World */
-               !string_equal_suffix( shader, "_bump" )
-               && !string_equal_suffix( shader, "_glow" )
-               && !string_equal_suffix( shader, "_h" )
+               /* Quetoo */
+               !string_equal_suffix( shader, "_h" )
                && !string_equal_suffix( shader, "_local" )
-               && !string_equal_suffix( shader, "_luma" )
                && !string_equal_suffix( shader, "_nm" )
                && !string_equal_suffix( shader, "_s" )
                /* DarkPlaces */
-               && !string_equal_suffix( shader, "_norm" )
-               // (already in Quake2World) && !string_equal_suffix( shader, "_bump" )
-               // (already in Quake2World) && !string_equal_suffix( shader, "_glow" )
+               && !string_equal_suffix( shader, "_bump" )
+               && !string_equal_suffix( shader, "_glow" )
                && !string_equal_suffix( shader, "_gloss" )
+               && !string_equal_suffix( shader, "_luma" )
+               && !string_equal_suffix( shader, "_norm" )
                && !string_equal_suffix( shader, "_pants" )
                && !string_equal_suffix( shader, "_shirt" )
                && !string_equal_suffix( shader, "_reflect" )