From: <tz...@us...> - 2010-03-26 02:13:09
|
Revision: 3404 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3404&view=rev Author: tzlaine Date: 2010-03-26 02:13:02 +0000 (Fri, 26 Mar 2010) Log Message: ----------- Moved the compile-time constant TEST_3D_COMBAT to a command-line flag, --test-3d-combat. Modified Paths: -------------- trunk/FreeOrion/client/human/HumanClientApp.cpp trunk/FreeOrion/server/ServerApp.cpp trunk/FreeOrion/util/MultiplayerCommon.cpp Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp =================================================================== --- trunk/FreeOrion/client/human/HumanClientApp.cpp 2010-03-26 01:58:38 UTC (rev 3403) +++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2010-03-26 02:13:02 UTC (rev 3404) @@ -195,6 +195,8 @@ args.push_back("\"" + GetOptionsDB().Get<std::string>("resource-dir") + "\""); args.push_back("--log-level"); args.push_back(GetOptionsDB().Get<std::string>("log-level")); + if (GetOptionsDB().Get<bool>("test-3d-combat")) + args.push_back("--test-3d-combat"); m_server_process = Process(SERVER_CLIENT_EXE, args); } Modified: trunk/FreeOrion/server/ServerApp.cpp =================================================================== --- trunk/FreeOrion/server/ServerApp.cpp 2010-03-26 01:58:38 UTC (rev 3403) +++ trunk/FreeOrion/server/ServerApp.cpp 2010-03-26 02:13:02 UTC (rev 3404) @@ -34,11 +34,7 @@ namespace fs = boost::filesystem; -namespace { - const bool TEST_3D_COMBAT = false; -} - //////////////////////////////////////////////// // PlayerSaveGameData //////////////////////////////////////////////// @@ -1022,7 +1018,7 @@ // TODO: Remove this up-front check when the 3D combat system is in // place - if (!TEST_3D_COMBAT) { + if (!GetOptionsDB().Get<bool>("test-3d-combat")) { AutoResolveCombat(combat_info); continue; } @@ -1046,7 +1042,7 @@ // TODO: Until there is a fully-implemented interactive combat system // to use, we autoresolve anyway, unless we're testing the // in-development 3D system. - if (TEST_3D_COMBAT) { + if (GetOptionsDB().Get<bool>("test-3d-combat")) { m_fsm->process_event( ResolveCombat(GetObject<System>(combat_info.system_id), combat_info.empire_ids)); while (m_current_combat) { Modified: trunk/FreeOrion/util/MultiplayerCommon.cpp =================================================================== --- trunk/FreeOrion/util/MultiplayerCommon.cpp 2010-03-26 01:58:38 UTC (rev 3403) +++ trunk/FreeOrion/util/MultiplayerCommon.cpp 2010-03-26 02:13:02 UTC (rev 3404) @@ -30,6 +30,7 @@ db.Add<std::string>("resource-dir", "OPTIONS_DB_RESOURCE_DIR", (GetRootDataDir() / "default").directory_string()); db.Add<std::string>("log-level", "OPTIONS_DB_LOG_LEVEL", "DEBUG"); db.Add<std::string>("stringtable-filename", "OPTIONS_DB_STRINGTABLE_FILENAME", "eng_stringtable.txt"); + db.AddFlag("test-3d-combat", "OPTIONS_DB_TEST_3D_COMBAT", false); } bool temp_bool = RegisterOptions(&AddOptions); |