From: <id...@us...> - 2010-04-30 15:12:43
|
Revision: 3569 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3569&view=rev Author: id-ego Date: 2010-04-30 15:12:37 +0000 (Fri, 30 Apr 2010) Log Message: ----------- - Noticed that Xcode project wasn't compiling Vec3Utilities.cpp source file - ServerApp.cpp: std::max(unsigned int, std::size_t) can result in inconsistent types in function template, changed local variables to std::size_t Modified Paths: -------------- trunk/FreeOrion/Xcode/FreeOrion.xcodeproj/project.pbxproj trunk/FreeOrion/server/ServerApp.cpp Modified: trunk/FreeOrion/Xcode/FreeOrion.xcodeproj/project.pbxproj =================================================================== --- trunk/FreeOrion/Xcode/FreeOrion.xcodeproj/project.pbxproj 2010-04-30 04:19:26 UTC (rev 3568) +++ trunk/FreeOrion/Xcode/FreeOrion.xcodeproj/project.pbxproj 2010-04-30 15:12:37 UTC (rev 3569) @@ -155,6 +155,7 @@ 34DD944A11360CDD00265AF9 /* RenderSystem_GL.dylib in Copy Ogre Plugins */ = {isa = PBXBuildFile; fileRef = 34DD944611360CBF00265AF9 /* RenderSystem_GL.dylib */; }; 34F0E429113F497500A10EED /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34F0E427113F491C00A10EED /* Python.framework */; }; 34F0E455113F49E900A10EED /* Python.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34F0E427113F491C00A10EED /* Python.framework */; }; + 34F909BF118B1BA0003A9EF1 /* Vec3Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B9EBEC0F5E1EEB005BF6A4 /* Vec3Utilities.cpp */; }; 470DF9A10A9CE53500A88AD6 /* HumanClientApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 471D5C640A98A3F900DA9C21 /* HumanClientApp.cpp */; }; 4710240A0CEF3AAC00A7DF2B /* AlignmentFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 471023920CEF3AAC00A7DF2B /* AlignmentFlags.cpp */; }; 4710240B0CEF3AAC00A7DF2B /* Base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 471023930CEF3AAC00A7DF2B /* Base.cpp */; }; @@ -3390,6 +3391,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 34F909BF118B1BA0003A9EF1 /* Vec3Utilities.cpp in Sources */, 34C4495E1182716E0071E09A /* Math.cpp in Sources */, 34C4495F1182716E0071E09A /* SerializeEmpire.cpp in Sources */, 34C449601182716E0071E09A /* SerializeMultiplayerCommon.cpp in Sources */, Modified: trunk/FreeOrion/server/ServerApp.cpp =================================================================== --- trunk/FreeOrion/server/ServerApp.cpp 2010-04-30 04:19:26 UTC (rev 3568) +++ trunk/FreeOrion/server/ServerApp.cpp 2010-04-30 15:12:37 UTC (rev 3569) @@ -1452,12 +1452,12 @@ // process combat turn if (m_current_combat->m_combat_turn_number) { pathing_engine.TurnStarted(m_current_combat->m_combat_turn_number); - const unsigned int MIN_ITERATIONS = 30; - const unsigned int ITERATIONS = + const std::size_t MIN_ITERATIONS = 30; + const std::size_t ITERATIONS = std::max(MIN_ITERATIONS, PathingEngine::SECONDS_PER_TURN * PathingEngine::TARGET_OBJECT_UPDATES_PER_SEC); const double ITERATION_DURATION = 1.0 * PathingEngine::SECONDS_PER_TURN / ITERATIONS; - for (unsigned int i = 0; i < ITERATIONS; ++i) { + for (std::size_t i = 0; i < ITERATIONS; ++i) { pathing_engine.Update(ITERATION_DURATION, true); } } |