From: <geo...@us...> - 2008-12-07 22:22:22
|
Revision: 2693 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2693&view=rev Author: geoffthemedio Date: 2008-12-07 21:43:38 +0000 (Sun, 07 Dec 2008) Log Message: ----------- -Added a ship part icon submitted by Josh to ensure it doesn't get lost -Added a custom Version.cpp for MSVC 2005 since the scons-created one doesn't exist if not using scons. This replaces the odd-looking un-substituted text with something less odd-looking on the splash screen and window title bar -Switch error logging in Python AI to output as error instead of debug Modified Paths: -------------- trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj trunk/FreeOrion/python/PythonLoggingWrapper.cpp Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/ship_parts/mass_driver.png trunk/FreeOrion/msvc2005/src/ trunk/FreeOrion/msvc2005/src/Version.cpp Property Changed: ---------------- trunk/FreeOrion/ Property changes on: trunk/FreeOrion ___________________________________________________________________ Modified: svn:ignore - patch_bak + patch_bak config.cache options.cache freeorion.exe freeorionca.exe freeoriond.exe alut.dll boost_python-vc80-mt-1_34.dll boost_python-vc80-mt-1_35.dll boost_python-vc80-mt-1_36.dll devil.dll GiGiOgre.dll GiGiOgrePlugin_OIS.dll glew32.dll ilu.dll ilut.dll jpeg.dll libexpat.dll libogg.dll libvorbis.dll libvorbisfile.dll log4cpp.dll msvcm80.dll msvcp80.dll msvcr80.dll OpenAL32.dll png.dll python25.dll SDL.dll wrap_oal.dll z.dll zlib1.dll Added: trunk/FreeOrion/default/data/art/icons/ship_parts/mass_driver.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/ship_parts/mass_driver.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2008-12-07 07:24:41 UTC (rev 2692) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorion/freeorion.vcproj 2008-12-07 21:43:38 UTC (rev 2693) @@ -606,15 +606,8 @@ > </File> <File - RelativePath="..\..\..\util\Version.cpp.in" + RelativePath="..\..\src\Version.cpp" > - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - /> - </FileConfiguration> </File> <File RelativePath="..\..\..\util\Version.h" Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2008-12-07 07:24:41 UTC (rev 2692) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeorionca/freeorionca.vcproj 2008-12-07 21:43:38 UTC (rev 2693) @@ -290,10 +290,6 @@ > </File> <File - RelativePath="..\..\..\util\Version.h" - > - </File> - <File RelativePath="..\..\..\util\XMLDoc.cpp" > </File> Modified: trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj =================================================================== --- trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2008-12-07 07:24:41 UTC (rev 2692) +++ trunk/FreeOrion/msvc2005/FreeOrion/freeoriond/freeoriond.vcproj 2008-12-07 21:43:38 UTC (rev 2693) @@ -575,10 +575,6 @@ > </File> <File - RelativePath="..\..\..\util\Version.h" - > - </File> - <File RelativePath="..\..\..\util\XMLDoc.cpp" > </File> Added: trunk/FreeOrion/msvc2005/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2005/src/Version.cpp (rev 0) +++ trunk/FreeOrion/msvc2005/src/Version.cpp 2008-12-07 21:43:38 UTC (rev 2693) @@ -0,0 +1,7 @@ +#include "../../util/Version.h" + +const std::string& FreeOrionVersionString() +{ + static const std::string retval = "Post-v0.3.10 [Development Build]"; + return retval; +} Modified: trunk/FreeOrion/python/PythonLoggingWrapper.cpp =================================================================== --- trunk/FreeOrion/python/PythonLoggingWrapper.cpp 2008-12-07 07:24:41 UTC (rev 2692) +++ trunk/FreeOrion/python/PythonLoggingWrapper.cpp 2008-12-07 21:43:38 UTC (rev 2693) @@ -37,7 +37,7 @@ for (int i = 0; i < MAX_SINGLE_CHUNK_TEXT_SIZE; ++i) { if (text[i] == '\0') break; if (text[i] == '\n' || i == MAX_SINGLE_CHUNK_TEXT_SIZE - 1) { - Logger().debugStream() << error_buffer; + Logger().errorStream() << error_buffer; error_buffer = ""; } else { error_buffer += text[i]; |