diff --git a/README.linux b/README.linux index 749503700..28ede1ae4 100644 --- a/README.linux +++ b/README.linux @@ -20,7 +20,7 @@ To compile, at least the following packages (and their development counterparts) * SDL_ttf and SDL_ttf-devel * zlib and zlib-devel * the ffmpeg libraries (libavformat and libswscale). Their name could be libavformat-devel and libswscale-devel, or ffmpeg-libs-devel or similar names. - * boost c++ libraries v1.44+ (www.boost.org): + * boost c++ libraries v1.46+ (www.boost.org): - program-options - filesystem - system @@ -41,7 +41,7 @@ trunk/build -> contains build output, makefiles, object files,... You can get latest sources with subversion: cd trunk - svn co https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk src + svn co http://svn.code.sf.net/p/vcmi/code/trunk/ III. Compilation diff --git a/client/CBitmapHandler.cpp b/client/CBitmapHandler.cpp index 03130eeb7..c4633a16b 100644 --- a/client/CBitmapHandler.cpp +++ b/client/CBitmapHandler.cpp @@ -151,6 +151,7 @@ SDL_Surface * BitmapHandler::loadBitmapFromDir(std::string path, std::string fna else { logGlobal->errorStream()<<"Failed to open "<errorStream()<<"Reason: " << IMG_GetError(); } } diff --git a/lib/CGeneralTextHandler.cpp b/lib/CGeneralTextHandler.cpp index 0a7dd0d0b..50470b2fa 100644 --- a/lib/CGeneralTextHandler.cpp +++ b/lib/CGeneralTextHandler.cpp @@ -116,7 +116,7 @@ float CLegacyConfigParser::readNumber() if (input.find(',') != std::string::npos) // code to handle conversion with comma as decimal separator stream.imbue(std::locale(std::locale(), new LocaleWithComma)); - int result; + float result; if ( !(stream >> result) ) return 0; return result;