Merge remote-tracking branch 'origin/terencehill/fexists'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:48:56 +0000 (14:48 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:48:56 +0000 (14:48 +0200)
1  2 
qcsrc/client/miscfunctions.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
@@@ -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))
        {
Simple merge
Simple merge