From a5dcb4c8fb9f1728aef3a192334f886510976e54 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 3 Jun 2011 07:53:38 +0200 Subject: [PATCH] ARGH, fix another terencehill bug - this fixes DDS detection for builds --- defaultXonotic.cfg | 4 ++-- qcsrc/menu/xonotic/util.qc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 29d71ce9b..8cc42a7ca 100644 --- 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 8544276bb..6ad4dfb8c 100644 --- 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)) { -- 2.39.2