Browse Source

- updated link to repo in readme
- image loader will report last SDL error if loading failed
- fixed parsing of floats from H3 txt's

Ivan Savenko 12 years ago
parent
commit
870399c7be
3 changed files with 4 additions and 3 deletions
  1. 2 2
      README.linux
  2. 1 0
      client/CBitmapHandler.cpp
  3. 1 1
      lib/CGeneralTextHandler.cpp

+ 2 - 2
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
 

+ 1 - 0
client/CBitmapHandler.cpp

@@ -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();
 		}
 	}
 

+ 1 - 1
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;