Skip to content

Commit

Permalink
- updated link to repo in readme
Browse files Browse the repository at this point in the history
- image loader will report last SDL error if loading failed
- fixed parsing of floats from H3 txt's

git-svn-id: http://svn.code.sf.net/p/vcmi/code/trunk@3409 4dfc6b2a-8b31-0410-aa91-d6c70e3ac834
  • Loading branch information
ivan91 committed Jun 9, 2013
1 parent 5f7a908 commit 5f1dc9b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.linux
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions client/CBitmapHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ SDL_Surface * BitmapHandler::loadBitmapFromDir(std::string path, std::string fna
else
{
logGlobal->errorStream()<<"Failed to open "<<fname<<" via SDL_Image";
logGlobal->errorStream()<<"Reason: " << IMG_GetError();
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/CGeneralTextHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5f1dc9b

Please sign in to comment.