Remove display from ai::game_info, and uses resources::screen instead

This commit is contained in:
Ali El Gariani 2010-06-16 14:19:21 +00:00
parent 10de0e9f69
commit a5e018951b
4 changed files with 6 additions and 11 deletions

View File

@ -285,7 +285,7 @@ game_info& readwrite_context_impl::get_info_w(){
void readonly_context_impl::diagnostic(const std::string& msg)
{
if(game_config::debug) {
get_info().disp.set_diagnostic(msg);
resources::screen->set_diagnostic(msg);
}
}
@ -299,7 +299,7 @@ const team& readonly_context_impl::current_team() const
void readonly_context_impl::log_message(const std::string& msg)
{
if(game_config::debug) {
get_info().disp.add_chat_message(time(NULL), "ai", get_side(), msg,
resources::screen->add_chat_message(time(NULL), "ai", get_side(), msg,
events::chat_handler::MESSAGE_PUBLIC, false);
}
}

View File

@ -101,7 +101,7 @@ void formula_ai::handle_exception(game_logic::formula_error& e, const std::strin
void formula_ai::display_message(const std::string& msg) const
{
get_info().disp.add_chat_message(time(NULL), "fai", get_side(), msg,
resources::screen->add_chat_message(time(NULL), "fai", get_side(), msg,
events::chat_handler::MESSAGE_PUBLIC, false);
}

View File

@ -120,17 +120,12 @@ typedef std::map<std::string, known_aspect_ptr > known_aspect_map;
class game_info {
public:
game_info(game_display& disp,
tod_manager& tod_mng, class game_state& game_state)
: disp(disp)
, tod_manager_(tod_mng)
game_info(tod_manager& tod_mng, class game_state& game_state)
: tod_manager_(tod_mng)
, game_state_(game_state)
, recent_attacks()
{}
/** The display object, used to draw the moves the AI makes. */
game_display& disp;
/** Information about what turn it is, and what time of day. */
tod_manager& tod_manager_;

View File

@ -71,7 +71,7 @@ playsingle_controller::playsingle_controller(const config& level,
browse_ = linger_ = true;
}
ai::game_info ai_info(*gui_, tod_manager_, gamestate_);
ai::game_info ai_info(tod_manager_, gamestate_);
ai::manager::set_ai_info(ai_info);
ai::manager::add_observer(this) ;
}