upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 20:49:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed gamestatus member from class turn_info

Browse Source
This commit is contained in:
Eugen Jiresch 2009-06-23 07:29:00 +00:00
parent 56e8bfade8
commit ea3fe5c834
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/playmp_controller.cpp
View File

@ -157,7 +157,7 @@ void playmp_controller::before_human_turn(bool save){
LOG_NG << "playmp::before_human_turn...\n";
playsingle_controller::before_human_turn(save);
turn_data_ = new turn_info(gamestate_,status_,tod_manager_,
turn_data_ = new turn_info(gamestate_,tod_manager_,
*gui_,map_,teams_,player_number_,units_,replay_sender_, undo_stack_, *this);
turn_data_->replay_error().attach_handler(this);
turn_data_->host_transfer().attach_handler(this);
@ -351,7 +351,7 @@ void playmp_controller::linger(upload_log& log)
try {
// reimplement parts of play_side()
player_number_ = first_player_;
turn_data_ = new turn_info(gamestate_, status_, tod_manager_,
turn_data_ = new turn_info(gamestate_, tod_manager_,
*gui_,map_, teams_, player_number_,
units_, replay_sender_, undo_stack_,*this);
turn_data_->replay_error().attach_handler(this);
@ -397,7 +397,7 @@ void playmp_controller::wait_for_upload()
const bool set_turn_data = (turn_data_ == 0);
if(set_turn_data) {
turn_data_ = new turn_info(gamestate_,status_,tod_manager_,
turn_data_ = new turn_info(gamestate_,tod_manager_,
*gui_,map_,teams_,player_number_,units_,replay_sender_, undo_stack_, *this);
turn_data_->replay_error().attach_handler(this);
turn_data_->host_transfer().attach_handler(this);
@ -476,7 +476,7 @@ void playmp_controller::play_network_turn(){
LOG_NG << "is networked...\n";
gui_->enable_menu("endturn", false);
turn_info turn_data(gamestate_,status_,tod_manager_,*gui_,
turn_info turn_data(gamestate_,tod_manager_,*gui_,
map_,teams_,player_number_,units_, replay_sender_, undo_stack_,*this);
turn_data.replay_error().attach_handler(this);
turn_data.host_transfer().attach_handler(this);
@ -552,7 +552,7 @@ void playmp_controller::process_oos(const std::string& err_msg){
}
void playmp_controller::handle_generic_event(const std::string& name){
turn_info turn_data(gamestate_,status_,tod_manager_,*gui_,
turn_info turn_data(gamestate_,tod_manager_,*gui_,
map_,teams_,player_number_,units_, replay_sender_, undo_stack_, *this);
if (name == "ai_user_interact"){

6
src/playsingle_controller.cpp
View File

@ -550,7 +550,7 @@ void playsingle_controller::play_turn(bool save)
init_side(player_number_ - 1);
} catch (end_turn_exception) {
if (current_team().is_network() == false) {
turn_info turn_data(gamestate_, status_, tod_manager_, *gui_, map_,
turn_info turn_data(gamestate_, tod_manager_, *gui_, map_,
teams_, player_number_, units_, replay_sender_, undo_stack_,*this);
recorder.end_turn();
turn_data.sync_network();
@ -573,7 +573,7 @@ void playsingle_controller::play_turn(bool save)
// If a side is dead end the turn.
if (current_team().is_human() && side_units(units_, player_number_) == 0)
{
turn_info turn_data(gamestate_, status_, tod_manager_, *gui_, map_,
turn_info turn_data(gamestate_, tod_manager_, *gui_, map_,
teams_, player_number_, units_, replay_sender_, undo_stack_, *this);
recorder.end_turn();
turn_data.sync_network();
@ -832,7 +832,7 @@ void playsingle_controller::play_ai_turn(){
const cursor::setter cursor_setter(cursor::WAIT);
turn_info turn_data(gamestate_,status_,tod_manager_,*gui_,
turn_info turn_data(gamestate_,tod_manager_,*gui_,
map_, teams_, player_number_, units_, replay_sender_, undo_stack_, *this);
try {

4
src/playturn.cpp
View File

@ -29,10 +29,10 @@ static lg::log_domain log_network("network");
#define ERR_NW LOG_STREAM(err, log_network)
turn_info::turn_info(game_state& state_of_game,
const gamestatus& status, const tod_manager& tod_mng, game_display& gui, gamemap& map,
const tod_manager& tod_mng, game_display& gui, gamemap& map,
std::vector<team>& teams, unsigned int team_num, unit_map& units,
replay_network_sender& replay_sender, undo_list& undo_stack, play_controller& controller)
: state_of_game_(state_of_game), status_(status), tod_manager_(tod_mng),
: state_of_game_(state_of_game), tod_manager_(tod_mng),
gui_(gui), map_(map), teams_(teams), team_num_(team_num),
units_(units), undo_stack_(undo_stack),
replay_sender_(replay_sender), replay_error_("network_replay_error"),

3
src/playturn.hpp
View File

@ -37,7 +37,7 @@ class turn_info
{
public:
turn_info(game_state& state_of_game,
const gamestatus& status, const tod_manager& tod_mng, game_display& gui, gamemap& map,
const tod_manager& tod_mng, game_display& gui, gamemap& map,
std::vector<team>& teams, unsigned int team_num, unit_map& units,
replay_network_sender& network_sender, undo_list& undo_stack, play_controller& controller);
@ -71,7 +71,6 @@ private:
static void change_side_controller(const std::string& side, const std::string& player, bool own_side=false);
game_state& state_of_game_;
const gamestatus& status_;
const tod_manager& tod_manager_;
game_display& gui_;
gamemap& map_;