Don't force DDS file usage (fixes #1392)

Fallback to a DDS file if the requested texture path doesn't point to an existing file, not vice versa

components/misc/resourcehelpers.cpp

@@ -63,28 +63,16 @@ std::string Misc::ResourceHelpers::correctResourcePath(const std::string &topLev
 
     std::string origExt = correctedPath;
 
-    // since we know all (GOTY edition or less) textures end
+    if (vfs->exists(origExt)
-    // in .dds, we change the extension
+     || (changeExtensionToDds(correctedPath) && vfs->exists(correctedPath)))
-    bool changedToDds = changeExtensionToDds(correctedPath);
-    if (vfs->exists(correctedPath))
         return correctedPath;
-    // if it turns out that the above wasn't true in all cases (not for vanilla, but maybe mods)
-    // verify, and revert if false (this call succeeds quickly, but fails slowly)
-    if (changedToDds && vfs->exists(origExt))
-        return origExt;
 
     // fall back to a resource in the top level directory if it exists
-    std::string fallback = topLevelDirectory + "\\" + getBasename(correctedPath);
+    std::string fallback = topLevelDirectory + "\\" + getBasename(origExt);
-    if (vfs->exists(fallback))
+    if (vfs->exists(fallback)
+     || (changeExtensionToDds(fallback) && vfs->exists(fallback)))
         return fallback;
 
-    if (changedToDds)
-    {
-        fallback = topLevelDirectory + "\\" + getBasename(origExt);
-        if (vfs->exists(fallback))
-            return fallback;
-    }
-
     return correctedPath;
 }