Author: crab
Date: Thu Jun 4 21:37:08 2009
New Revision: 36059
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36059&view=rev
Log:
AI refactoring: ai_configuration -> ai::configuration
Modified:
trunk/src/ai/ai_configuration.cpp
trunk/src/ai/ai_configuration.hpp
trunk/src/ai/ai_manager.cpp
Modified: trunk/src/ai/ai_configuration.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_configuration.cpp?rev=36059&r1=36058&r2=36059&view=diff
==============================================================================
--- trunk/src/ai/ai_configuration.cpp (original)
+++ trunk/src/ai/ai_configuration.cpp Thu Jun 4 21:37:08 2009
@@ -25,6 +25,8 @@
#include "../serialization/preprocessor.hpp"
#include "../team.hpp"
+namespace ai {
+
static lg::log_domain log_ai_configuration("ai/config");
#define DBG_AI_CONFIGURATION LOG_STREAM(debug, log_ai_configuration)
#define LOG_AI_CONFIGURATION LOG_STREAM(info, log_ai_configuration)
@@ -44,7 +46,7 @@
return default_value;
}
-bool ai_configuration::get_side_config_from_file(const std::string& file,
config& cfg ){
+bool configuration::get_side_config_from_file(const std::string& file, config&
cfg ){
try {
scoped_istream stream =
preprocess_file(get_wml_location(file));
read(cfg, *stream);
@@ -58,7 +60,7 @@
}
-bool ai_configuration::parse_side_config(const config& cfg,
+bool configuration::parse_side_config(const config& cfg,
std::string& ai_algorithm_type,
config& global_ai_parameters,
std::vector<config>& ai_parameters,
@@ -127,7 +129,7 @@
//some default values for the AI parameters following the default values listed
//in the wiki at http://www.wesnoth.org/wiki/AiWML
//@todo 1.7 think about reading this from config
-const config& ai_configuration::get_default_ai_parameters(){
+const config& configuration::get_default_ai_parameters(){
static config default_cfg;
if (!default_cfg["init"].empty()) {
return default_cfg;
@@ -162,3 +164,5 @@
LOG_AI_CONFIGURATION << "AI default configuration is created" <<
std::endl;
return default_cfg;
}
+
+} //end of namespace ai
Modified: trunk/src/ai/ai_configuration.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_configuration.hpp?rev=36059&r1=36058&r2=36059&view=diff
==============================================================================
--- trunk/src/ai/ai_configuration.hpp (original)
+++ trunk/src/ai/ai_configuration.hpp Thu Jun 4 21:37:08 2009
@@ -27,6 +27,8 @@
#include <vector>
+namespace ai {
+
/**
* AI parameters. class to deal with AI parameters. It is an implementation
detail.
* @todo 1.7 AI parameter/AI memory/AI effective parameter system must be
reworked
@@ -44,7 +46,7 @@
* then, if (3) is equal:
* use any and loudly complain.
*/
-class ai_configuration {
+class configuration {
public:
/**
@@ -87,5 +89,5 @@
};
-
+} //end of namespace ai
#endif
Modified: trunk/src/ai/ai_manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_manager.cpp?rev=36059&r1=36058&r2=36059&view=diff
==============================================================================
--- trunk/src/ai/ai_manager.cpp (original)
+++ trunk/src/ai/ai_manager.cpp Thu Jun 4 21:37:08 2009
@@ -505,7 +505,7 @@
bool manager::add_ai_for_side_from_file( int side, const std::string& file,
bool replace )
{
config cfg;
- if (!ai_configuration::get_side_config_from_file(file,cfg)){
+ if (!configuration::get_side_config_from_file(file,cfg)){
ERR_AI_MANAGER << " unable to read [SIDE] config for side "<<
side << "from file [" << file <<"]"<< std::endl;
return false;
}
@@ -517,11 +517,11 @@
config ai_memory;//AI memory
std::vector<config> ai_parameters;//AI parameters inside [ai] tags. May
contain filters
config global_ai_parameters ;//AI parameters which do not have a filter
applied
- const config& default_ai_parameters =
ai_configuration::get_default_ai_parameters();//default AI parameters
+ const config& default_ai_parameters =
configuration::get_default_ai_parameters();//default AI parameters
std::string ai_algorithm_type;//AI algorithm type
config effective_ai_parameters;//legacy effective ai parameters
- ai_configuration::parse_side_config(cfg, ai_algorithm_type,
global_ai_parameters, ai_parameters, default_ai_parameters, ai_memory,
effective_ai_parameters);
+ configuration::parse_side_config(cfg, ai_algorithm_type,
global_ai_parameters, ai_parameters, default_ai_parameters, ai_memory,
effective_ai_parameters);
if (replace) {
remove_ai_for_side (side);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
