From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 14 May 2011 12:48:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/terencehill/fexists'
X-Git-Tag: xonotic-v0.5.0~263^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=30b10531b2a91c90b25120a5b339f04f35135eb0

Merge remote-tracking branch 'origin/terencehill/fexists'
---

30b10531b2a91c90b25120a5b339f04f35135eb0
diff --cc qcsrc/menu/xonotic/util.qc
index 121f8ac23,c24693e6d..8544276bb
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@@ -464,17 -464,21 +464,13 @@@ string resolvemod(string m
  		return m;
  }
  
 -string HUD_Panel_GetSettingName(float theSetting)
 -{
 -	switch(theSetting) {
 -		case HUD_MENU_ENABLE: return ""; break;
 -		default: return "";
 -	}
 -}
 -
  float updateCompression()
  {
- 	float fh;
  	float have_dds, have_jpg, have_tga;
  	float can_dds;
- 	if((have_dds = ((fh = fopen("dds/particles/particlefont.dds", FILE_READ)) >= 0)))
- 		fclose(fh);
- 	if((have_jpg = ((fh = fopen("particles/particlefont.jpg", FILE_READ)) >= 0)))
- 		fclose(fh);
- 	if((have_tga = ((fh = fopen("particles/particlefont.tga", FILE_READ)) >= 0)))
- 		fclose(fh);
+ 	have_dds = (fexists("dds/particles/particlefont.dds"));
+ 	have_dds = (fexists("particles/particlefont.jpg"));
+ 	have_dds = (fexists("particles/particlefont.tga"));
  	can_dds = GL_Have_TextureCompression();
  	if(have_dds && (have_jpg || have_tga))
  	{