1 --- vcmi-0.89/Global.h~ 2012-05-27 21:06:35.000000000 +0200
2 +++ vcmi-0.89/Global.h 2012-07-11 13:50:38.816526901 +0200
6 //filesystem version 3 causes problems (and it's default as of boost 1.46)
\r
7 -#define BOOST_FILESYSTEM_VERSION 2
\r
8 +#define BOOST_FILESYSTEM_VERSION 3
\r
10 #include <boost/algorithm/string.hpp>
\r
11 #include <boost/assert.hpp>
\r
12 --- vcmi-0.89/lib/CLodHandler.cpp~ 2012-05-25 13:49:56.000000000 +0200
13 +++ vcmi-0.89/lib/CLodHandler.cpp 2012-07-11 13:58:30.506510264 +0200
15 if (boost::filesystem::is_directory(dir->status()))
\r
17 path.resize(dir.level()+1);
\r
18 - path.back() = dir->path().leaf();
\r
19 + path.back() = dir->path().filename().string();
\r
21 if(boost::filesystem::is_regular(dir->status()))
\r
24 for (size_t i=0; i<dir.level() && i<path.size(); i++)
\r
25 e.realName += path[i] + '/';
\r
27 - e.realName += dir->path().leaf();
\r
28 + e.realName += dir->path().filename().string();
\r
30 initEntry(e, e.realName);
\r
32 --- vcmi-0.89/client/CPlayerInterface.cpp~ 2012-05-20 00:57:24.000000000 +0200
33 +++ vcmi-0.89/client/CPlayerInterface.cpp 2012-07-11 14:01:17.689846035 +0200
36 if(is_regular(dir->status()))
\r
38 - std::string name = dir->path().leaf();
\r
39 + std::string name = dir->path().filename().string();
\r
40 if(starts_with(name, namePrefix) && ends_with(name, ".vlgm1"))
\r
42 char nr = name[namePrefix.size()];
\r
43 --- vcmi-0.89/Scripting/ERM/ERMInterpreter.cpp~ 2012-02-16 18:10:58.000000000 +0100
44 +++ vcmi-0.89/Scripting/ERM/ERMInterpreter.cpp 2012-07-11 14:04:08.642118903 +0200
47 if(is_regular(dir->status()))
\r
49 - std::string name = dir->path().leaf();
\r
50 + std::string name = dir->path().filename().string();
\r
51 if( boost::algorithm::ends_with(name, ".erm") ||
\r
52 boost::algorithm::ends_with(name, ".verm") )
\r