Author: euschn
Date: Mon Jun 22 14:48:35 2009
New Revision: 36351
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36351&view=rev
Log:
removed gamestatus member from ai::game_info and ai_default
Modified:
trunk/src/ai/composite/stage.cpp
trunk/src/ai/default/ai.cpp
trunk/src/ai/default/ai.hpp
trunk/src/ai/default/attack.cpp
trunk/src/ai/default/contexts.cpp
trunk/src/ai/default/contexts.hpp
trunk/src/ai/dfool/ai.cpp
trunk/src/ai/game_info.hpp
trunk/src/playsingle_controller.cpp
Modified: trunk/src/ai/composite/stage.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/composite/stage.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/composite/stage.cpp (original)
+++ trunk/src/ai/composite/stage.cpp Mon Jun 22 14:48:35 2009
@@ -78,7 +78,7 @@
}
void idle_stage::do_play_stage(){
- LOG_AI_COMPOSITE_STAGE << "Turn " << get_info().state.turn() << ":
playing idle stage for side: "<< get_side() << std::endl;
+ LOG_AI_COMPOSITE_STAGE << "Turn " << get_info().tod_manager_.turn() <<
": playing idle stage for side: "<< get_side() << std::endl;
}
} //end of namespace composite_ai
Modified: trunk/src/ai/default/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/ai.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/default/ai.cpp (original)
+++ trunk/src/ai/default/ai.cpp Mon Jun 22 14:48:35 2009
@@ -248,7 +248,6 @@
map_(context.get_info().map),
units_(context.get_info().units),
teams_(context.get_info().teams),
- state_(context.get_info().state),
tod_manager_(context.get_info().tod_manager_),
consider_combat_(true),
additional_targets_(),
Modified: trunk/src/ai/default/ai.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/ai.hpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/default/ai.hpp (original)
+++ trunk/src/ai/default/ai.hpp Mon Jun 22 14:48:35 2009
@@ -186,7 +186,6 @@
gamemap& map_;
unit_map& units_;
std::vector<team>& teams_;
- gamestatus& state_;
tod_manager& tod_manager_;
bool consider_combat_;
std::vector<target> additional_targets_;
Modified: trunk/src/ai/default/attack.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/attack.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/default/attack.cpp (original)
+++ trunk/src/ai/default/attack.cpp Mon Jun 22 14:48:35 2009
@@ -34,7 +34,7 @@
void attack_analysis::analyze(const gamemap& map, unit_map& units,
const
std::vector<team>& teams,
- const
gamestatus& status, const tod_manager& tod_mng,
+ const
tod_manager& tod_mng,
class
default_ai_context& ai_obj,
const move_map& dstsrc, const move_map&
srcdst,
const move_map& enemy_dstsrc, double
aggression)
Modified: trunk/src/ai/default/contexts.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/contexts.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/default/contexts.cpp (original)
+++ trunk/src/ai/default/contexts.cpp Mon Jun 22 14:48:35 2009
@@ -444,7 +444,7 @@
cur_analysis.is_surrounded = is_surrounded;
- cur_analysis.analyze(map_, units_, teams_,
get_info().state, get_info().tod_manager_, *this, dstsrc, srcdst, enemy_dstsrc,
current_team().aggression());
+ cur_analysis.analyze(map_, units_, teams_,
get_info().tod_manager_, *this, dstsrc, srcdst, enemy_dstsrc,
current_team().aggression());
//This logic to sometimes not add the attack because it
doesn't
//rate high enough seems to remove attacks from
consideration
Modified: trunk/src/ai/default/contexts.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/default/contexts.hpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/default/contexts.hpp (original)
+++ trunk/src/ai/default/contexts.hpp Mon Jun 22 14:48:35 2009
@@ -59,7 +59,7 @@
void analyze(const gamemap& map, unit_map& units,
const std::vector<team>& teams,
- const gamestatus& status, const tod_manager&
tod_mng,
+ const tod_manager& tod_mng,
class default_ai_context& ai_obj,
const move_map& dstsrc, const move_map& srcdst,
const move_map& enemy_dstsrc, double
aggression);
Modified: trunk/src/ai/dfool/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/dfool/ai.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/dfool/ai.cpp (original)
+++ trunk/src/ai/dfool/ai.cpp Mon Jun 22 14:48:35 2009
@@ -74,7 +74,7 @@
// LOG_STREAM(info,
ai)<<"\t\t\t"<<u->second.get_ai_special()<<std::endl;
// LOG_STREAM(info,
ai)<<"\t\t\t"<<u->first.x<<","<<u->first.y<<std::endl;
- unit_memory_.add_unit_sighting(u->second, u->first,
get_info().state.turn());
+ unit_memory_.add_unit_sighting(u->second, u->first,
get_info().tod_manager_.turn());
}
}
@@ -250,7 +250,7 @@
move_map srcdst, dstsrc;
unit_map known_units;
- // unit_memory_.known_map(known_units, get_info().state.turn());
+ // unit_memory_.known_map(known_units,
get_info().tod_manager_.turn());
unit_memory_.known_map(known_units, 0);
LOG_AI << "known units:\n";
Modified: trunk/src/ai/game_info.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/game_info.hpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/ai/game_info.hpp (original)
+++ trunk/src/ai/game_info.hpp Mon Jun 22 14:48:35 2009
@@ -48,9 +48,9 @@
public:
game_info(game_display& disp, gamemap& map, unit_map& units,
- std::vector<team>& teams, gamestatus& state,
tod_manager& tod_mng, class game_state& game_state)
+ std::vector<team>& teams, tod_manager& tod_mng, class
game_state& game_state)
: disp(disp), map(map), units(units), teams(teams),
- state(state), tod_manager_(tod_mng),
game_state_(game_state)
+ tod_manager_(tod_mng), game_state_(game_state)
{}
/** The display object, used to draw the moves the AI makes. */
@@ -66,9 +66,6 @@
std::vector<team>& teams;
/** Information about what turn it is, and what time of day. */
- gamestatus& state;
-
- /** Information about what turn it is, and what time of day. */
tod_manager& tod_manager_;
/** The global game state, because we may set the completion
field. */
Modified: trunk/src/playsingle_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playsingle_controller.cpp?rev=36351&r1=36350&r2=36351&view=diff
==============================================================================
--- trunk/src/playsingle_controller.cpp (original)
+++ trunk/src/playsingle_controller.cpp Mon Jun 22 14:48:35 2009
@@ -66,7 +66,7 @@
browse_ = linger_ = true;
}
- ai::game_info ai_info(*gui_,map_,units_,teams_,status_, tod_manager_,
gamestate_);
+ ai::game_info ai_info(*gui_,map_,units_,teams_, tod_manager_,
gamestate_);
ai::manager::set_ai_info(ai_info);
ai::manager::add_observer(this) ;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
