ARGH, fix another terencehill bug - this fixes DDS detection for builds

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 29d71ce9bde267daff4362d1d7d19607fbbadd1e..8cc42a7cae86459df2ec169c05c0e5d6931abc1d 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -2036,8 +2036,8 @@ scr_conforcewhiledisconnected 0
 scr_infobar_height 12
 
 // DP cannot properly detect this, so rather turn off the detection
-r_texture_dds_load_dxt1_noalpha 1
-r_texture_dds_load_swdecode 1 // SW decode to quarter res if we want to load DDS but don't support the extension for it
+r_texture_dds_load_alphamode 2
+r_texture_dds_swdecode 1 // SW decode to quarter res if we want to load DDS but don't support the extension for it
 r_texture_dds_load_logfailure 0 // this engine feature SUCKS
 set vid_netwmfullscreen 0 // doesn't support non-native res
 

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 8544276bb2a73cdc50bd580d15a5a34e28550f92..6ad4dfb8cc33c67fc5bcf66965dd644bd31cb0a5 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -469,8 +469,8 @@ float updateCompression()
        float have_dds, have_jpg, have_tga;
        float can_dds;
        have_dds = (fexists("dds/particles/particlefont.dds"));
-       have_dds = (fexists("particles/particlefont.jpg"));
-       have_dds = (fexists("particles/particlefont.tga"));
+       have_jpg = (fexists("particles/particlefont.jpg"));
+       have_tga = (fexists("particles/particlefont.tga"));
        can_dds = GL_Have_TextureCompression();
        if(have_dds && (have_jpg || have_tga))
        {