Author: crab
Date: Thu Apr 2 02:27:11 2009
New Revision: 34385
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34385&view=rev
Log:
Delay default AI parameter initialization. This fixes a MSVC runtime error.
Modified:
trunk/src/ai_configuration.cpp
trunk/src/ai_configuration.hpp
Modified: trunk/src/ai_configuration.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_configuration.cpp?rev=34385&r1=34384&r2=34385&view=diff
==============================================================================
--- trunk/src/ai_configuration.cpp (original)
+++ trunk/src/ai_configuration.cpp Thu Apr 2 02:27:11 2009
@@ -123,15 +123,16 @@
return true;
}
-const config& ai_configuration::get_default_ai_parameters(){
- return default_ai_parameters_;
-}
-
//some default values for the AI parameters following the default values listed
//in the wiki at http://www.wesnoth.org/wiki/AiWML
//@todo: think about reading this from config
-const config ai_configuration::create_default_ai_parameters(){
- config default_cfg;
+const config& ai_configuration::get_default_ai_parameters(){
+ static config default_cfg;
+ if (!default_cfg["init"].empty()) {
+ return default_cfg;
+ }
+
+ default_cfg["init"] = "true";
default_cfg["al_algorithm"] = "default";
@@ -160,6 +161,3 @@
LOG_AI_CONFIGURATION << "AI default configuration is created" <<
std::endl;
return default_cfg;
}
-
-
-const config
ai_configuration::default_ai_parameters_(ai_configuration::create_default_ai_parameters());
Modified: trunk/src/ai_configuration.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_configuration.hpp?rev=34385&r1=34384&r2=34385&view=diff
==============================================================================
--- trunk/src/ai_configuration.hpp (original)
+++ trunk/src/ai_configuration.hpp Thu Apr 2 02:27:11 2009
@@ -85,9 +85,6 @@
*/
static const config& get_default_ai_parameters();
-private:
- static const config create_default_ai_parameters();
- static const config default_ai_parameters_;
};
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
