From b7a5056a4a0e8085ac3c2d4d0f0c751f59371162 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sat, 9 Apr 2011 16:00:16 +0000 Subject: [PATCH] Remove deprecated code and minor cleanup. --- src/builder.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/builder.cpp b/src/builder.cpp index 0ffb90933a3..baad99ecd57 100644 --- a/src/builder.cpp +++ b/src/builder.cpp @@ -288,20 +288,12 @@ static bool image_exists(const std::string& name) { bool precached = name.find("..") == std::string::npos; - if(precached) { - if(image::precached_file_exists(name)) - return true; - } else if (image::exists(name)){ + if(precached && image::precached_file_exists(name)) { + return true; + } else if(image::exists(name)) { return true; } - // This warning can be removed after 1.9.2 - ///@deprecated 1.9.2 warning for missing .png in terrain images - if(name.find(".png") == std::string::npos) { - const std::string name_png = name + ".png"; - if(image::exists(name_png) || (precached && image::precached_file_exists(name_png))) { - lg::wml_error << "Terrain image '" << name << "' misses the '.png' extension\n"; - } - } + return false; }