mail[Wesnoth-commits] r28974 - /trunk/src/image.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by paniemin on August 25, 2008 - 17:38:
Author: suokko
Date: Mon Aug 25 17:38:39 2008
New Revision: 28974

URL: http://svn.gna.org/viewcvs/wesnoth?rev=28974&view=rev
Log:
* remove decprecated unit/ image loading code

Modified:
    trunk/src/image.cpp

Modified: trunk/src/image.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/image.cpp?rev=28974&r1=28973&r2=28974&view=diff
==============================================================================
--- trunk/src/image.cpp (original)
+++ trunk/src/image.cpp Mon Aug 25 17:38:39 2008
@@ -299,24 +299,12 @@
 
        std::string location = get_binary_file_location("images", 
val_.filename_);
 
-       bool try_units = false;
-
-       do {
+
+       {
                if (!location.empty()) {
                        res = IMG_Load(location.c_str());
                }
-               if (res.null() && (!try_units)) {
-                       try_units = true;
-                       location = get_binary_file_location("images", 
"units/" + val_.filename_);
-                       if (!location.empty() && !val_.filename_.empty()) {
-                               LOG_STREAM(err, filesystem) << "warning: 
implict prefix 'units/' for '" <<
-                                       val_.filename_ << "'. Support of this 
will be removed in 1.5.3\n";
-                       }
-
-               } else {
-                       try_units = false;
-               }
-       } while (try_units);
+       }
 
        if (res.null() && !val_.filename_.empty()) {
                ERR_DP << "could not open image '" << val_.filename_ << "'\n";




Related Messages


Powered by MHonArc, Updated Mon Aug 25 17:41:22 2008