games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity

- updated link to repo in readme

Browse Source 
- image loader will report last SDL error if loading failed
- fixed parsing of floats from H3 txt's
This commit is contained in:
Ivan Savenko 2013-06-09 10:09:28 +00:00
parent cdefb12d4c
commit 870399c7be
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.linux
View File

@ -20,7 +20,7 @@ To compile, at least the following packages (and their development counterparts)
* SDL_ttf and SDL_ttf-devel * SDL_ttf and SDL_ttf-devel
* zlib and zlib-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. * 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 - program-options
- filesystem - filesystem
- system - system
@ -41,7 +41,7 @@ trunk/build -> contains build output, makefiles, object files,...
You can get latest sources with subversion: You can get latest sources with subversion:
cd trunk 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 III. Compilation

1
client/CBitmapHandler.cpp
View File

@ -151,6 +151,7 @@ SDL_Surface * BitmapHandler::loadBitmapFromDir(std::string path, std::string fna
else else
{ {
logGlobal->errorStream()<<"Failed to open "<<fname<<" via SDL_Image"; logGlobal->errorStream()<<"Failed to open "<<fname<<" via SDL_Image";
logGlobal->errorStream()<<"Reason: " << IMG_GetError();
} }
} }

2
lib/CGeneralTextHandler.cpp
View File

@ -116,7 +116,7 @@ float CLegacyConfigParser::readNumber()
if (input.find(',') != std::string::npos) // code to handle conversion with comma as decimal separator if (input.find(',') != std::string::npos) // code to handle conversion with comma as decimal separator
stream.imbue(std::locale(std::locale(), new LocaleWithComma)); stream.imbue(std::locale(std::locale(), new LocaleWithComma));
int result; float result;
if ( !(stream >> result) ) if ( !(stream >> result) )
return 0; return 0;
return result; return result;