0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when explicitely specifying the default AI prevent it from getting...

Browse source 
...managed and don't show a not found error
This commit is contained in:
Gunter Labes 2009-01-15 21:52:44 +00:00
parent 2f6e86000b
commit fdb8c2feda
1 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/ai.cpp
View file

@ -258,12 +258,12 @@ ai_interface* create_ai(const std::string& name, ai_interface::info& info)
// return new pyai::PythonAI( info ) ;
#else
{
LOG_STREAM(err, ai) << "No Python AI support available in this Wesnoth build!\n";
return new ai2(info);
ERR_AI << "No Python AI support available in this Wesnoth build! Using the default AI instead.\n";
return new ai(info);
}
#endif
else if(name != "") {
LOG_STREAM(err, ai) << "AI not found: '" << name << "'\n";
else if(name != "" && name != "default") {
ERR_AI << "AI not found: '" << name << "'. Using default instead.\n";
}
return new ai(info);
@ -2489,40 +2489,33 @@ ai_manager::AINameMap ai_manager::ais = ai_manager::AINameMap();
boost::intrusive_ptr<ai_interface> ai_manager::get_ai( std::string ai_algo,
ai_interface::info& ai_info )
{
int ai_key = ai_info.team_num - 1 ;
boost::intrusive_ptr<ai_interface> ai_obj;
int ai_key = ai_info.team_num - 1 ;
boost::intrusive_ptr<ai_interface> ai_obj;
// If we are dealing with an AI - try to find it
if( ai_algo.size() )
{
AINameMap::const_iterator itor = ais.find(ai_key);
LOG_AI << "ai_manager::get_ai() for algorithm: " << ai_algo << std::endl ;
if(itor == ais.end())
{
LOG_AI << "manager did not find AI - creating..." << std::endl ;
ai_obj = create_ai(ai_algo, ai_info) ;
LOG_AI << "Asking newly created AI if it wants to be managed." << std::endl ;
if( ai_obj->manager_manage_ai() )
{
LOG_AI << "AI has requested itself be managed: " << ai_algo << std::endl ;
AINameMap::value_type new_ai_pair( ai_key, ai_obj ) ;
itor = ais.insert(new_ai_pair).first ;
}
// If we are dealing with an AI - try to find it
if(!ai_algo.empty() && ai_algo != "default") {
AINameMap::const_iterator itor = ais.find(ai_key);
LOG_AI << "ai_manager::get_ai() for algorithm: " << ai_algo << std::endl;
if (itor == ais.end()) {
LOG_AI << "manager did not find AI - creating..." << std::endl;
ai_obj = create_ai(ai_algo, ai_info);
LOG_AI << "Asking newly created AI if it wants to be managed." << std::endl;
if (ai_obj->manager_manage_ai()) {
LOG_AI << "AI has requested itself be managed: " << ai_algo << std::endl;
AINameMap::value_type new_ai_pair(ai_key, ai_obj);
itor = ais.insert(new_ai_pair).first;
}
} else {
// AI was found - so return it
LOG_AI << "Reusing managed AI" << std::endl;
ai_obj = itor->second;
}
} else {
// No AI algorithm - simply create the instance
ai_obj = create_ai(ai_algo, ai_info);
}
else
{
// AI was found - so return it
LOG_AI << "Reusing managed AI" << std::endl ;
ai_obj = itor->second ;
}
}
else
{
// No AI algorithm - simply create the instance
ai_obj = create_ai(ai_algo, ai_info) ;
}
return ai_obj ;
return ai_obj ;
}