Author: crab
Date: Thu Jun 4 23:34:37 2009
New Revision: 36064
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36064&view=rev
Log:
AI refactoring: dfool::dfool_ai -> ai::dfool::dfool_ai
Modified:
trunk/src/ai/ai_dfool.cpp
trunk/src/ai/ai_dfool.hpp
Modified: trunk/src/ai/ai_dfool.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_dfool.cpp?rev=36064&r1=36063&r2=36064&view=diff
==============================================================================
--- trunk/src/ai/ai_dfool.cpp (original)
+++ trunk/src/ai/ai_dfool.cpp Thu Jun 4 23:34:37 2009
@@ -21,10 +21,13 @@
#include "../log.hpp"
#include "../formula_string_utils.hpp"
+namespace ai {
+
+namespace dfool {
+
static lg::log_domain log_ai("ai/dfool");
#define LOG_AI LOG_STREAM(info, log_ai)
-namespace dfool {
void dfool_ai::play_turn(){
int team_num = get_side();
const config& parms = current_team().ai_parameters();
@@ -242,8 +245,8 @@
map_location target(atoi(o["target_x"].c_str()) - 1,
atoi(o["target_y"].c_str()) - 1);
LOG_AI << "\tmoving to:(" << target.x << ',' << target.y << ")\n";
if(m->second.movement_left()){
- ai::moves_map possible_moves;
- ai::move_map srcdst, dstsrc;
+ moves_map possible_moves;
+ move_map srcdst, dstsrc;
unit_map known_units;
// unit_memory_.known_map(known_units, get_info().state.turn());
@@ -260,7 +263,7 @@
std::pair<map_location,map_location> closest_move;
/** @todo 2.0 This undoubtedly could be done more cleanly */
- for(ai::move_map::const_iterator i = dstsrc.begin(); i != dstsrc.end();
++i) {
+ for(move_map::const_iterator i = dstsrc.begin(); i != dstsrc.end();
++i) {
// Must restrict move_map to only unit that is moving.
if(i->second==m->first){
const int distance = distance_between(target,i->first);
@@ -674,4 +677,6 @@
t<<distance;
return(t.str());
}
-} // end namespace dfool
+} // end of namespace dfool
+
+} // end of namespace ai
Modified: trunk/src/ai/ai_dfool.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_dfool.hpp?rev=36064&r1=36063&r2=36064&view=diff
==============================================================================
--- trunk/src/ai/ai_dfool.hpp (original)
+++ trunk/src/ai/ai_dfool.hpp Thu Jun 4 23:34:37 2009
@@ -32,6 +32,8 @@
#include <list>
#include <map>
#include <string>
+
+namespace ai {
namespace dfool {
typedef std::vector<size_t> unit_list;
@@ -99,12 +101,12 @@
* does not target units that it has not "seen",
* and does not make decisions based on unseen units.
*/
- class dfool_ai : public ai::readwrite_context_proxy, public ai::interface {
+ class dfool_ai : public default_ai_context_proxy, public interface {
public:
- dfool_ai(ai::readwrite_context &context)
- : recursion_counter_(context.get_recursion_count()),
unit_memory_(current_team().ai_memory())
+ dfool_ai(default_ai_context &context)
+ : recursion_counter_(context.get_recursion_count()),
unit_memory_(context.current_team().ai_memory())
{
- init_readwrite_context_proxy(context);
+ init_default_ai_context_proxy(context);
}
void play_turn();
virtual std::string describe_self();
@@ -112,11 +114,11 @@
return recursion_counter_.get_count();
}
private:
- ai::recursion_counter recursion_counter_;
+ recursion_counter recursion_counter_;
// std::map<std::string,target> target_map_;
unit_list all_units();
unit_list visible_units();
- void switch_side(ai::side_number /*side*/)
+ void switch_side(side_number /*side*/)
{}
unit_list my_units();
unit_list filter_units(const config& filter,unit_list& ul, unit_map& um);
@@ -127,6 +129,8 @@
};
-} // end namespace dfool
+} // end of namespace dfool
+
+} // end of namespace ai
#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
