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

remove turn_info::team_num_

Browse source 
it's not used anymore.
This commit is contained in:
gfgtdf 2014-05-27 02:15:23 +02:00
parent d28a1d6563
commit c621bfde14
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/playmp_controller.cpp
View file

@ -452,7 +452,7 @@ void playmp_controller::play_network_turn(){
LOG_NG << "is networked...\n";
end_turn_enable(false);
turn_info turn_data(player_number_, replay_sender_, network_reader_);
turn_info turn_data(replay_sender_, network_reader_);
turn_data.host_transfer().attach_handler(this);
for(;;) {
@ -509,7 +509,7 @@ void playmp_controller::play_network_turn(){
}
void playmp_controller::init_turn_data() {
turn_data_ = new turn_info(player_number_, replay_sender_,network_reader_);
turn_data_ = new turn_info(replay_sender_,network_reader_);
turn_data_->host_transfer().attach_handler(this);
}
@ -538,7 +538,7 @@ void playmp_controller::process_oos(const std::string& err_msg) const {
}
void playmp_controller::handle_generic_event(const std::string& name){
turn_info turn_data(player_number_, replay_sender_, network_reader_);
turn_info turn_data(replay_sender_, network_reader_);
if (name == "ai_user_interact"){
playsingle_controller::handle_generic_event(name);

6
src/playsingle_controller.cpp
View file

@ -619,7 +619,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(player_number_, replay_sender_,network_reader_);
turn_info turn_data( replay_sender_,network_reader_);
recorder.end_turn();
turn_data.sync_network();
}
@ -636,7 +636,7 @@ void playsingle_controller::play_turn(bool save)
if (current_team().is_human() && side_units(player_number_) == 0
&& (resources::units->size() != 0 || player_number_ != 1))
{
turn_info turn_data(player_number_, replay_sender_, network_reader_);
turn_info turn_data( replay_sender_, network_reader_);
recorder.end_turn();
turn_data.sync_network();
continue;
@ -938,7 +938,7 @@ void playsingle_controller::play_ai_turn(){
synced_context::run_in_synced_context("auto_shroud", replay_helper::get_auto_shroud(true));
}
turn_info turn_data(player_number_, replay_sender_, network_reader_);
turn_info turn_data(replay_sender_, network_reader_);
try {
ai::manager::play_turn(player_number_);

3
src/playturn.cpp
View file

@ -38,8 +38,7 @@
static lg::log_domain log_network("network");
#define ERR_NW LOG_STREAM(err, log_network)
turn_info::turn_info(unsigned team_num, replay_network_sender &replay_sender,playturn_network_adapter &network_reader) :
team_num_(team_num),
turn_info::turn_info(replay_network_sender &replay_sender,playturn_network_adapter &network_reader) :
replay_sender_(replay_sender),
host_transfer_("host_transfer"),
network_reader_(network_reader)

4
src/playturn.hpp
View file

@ -26,7 +26,7 @@ class replay_network_sender;
class turn_info
{
public:
turn_info(unsigned team_num, replay_network_sender &network_sender, playturn_network_adapter &network_reader);
turn_info(replay_network_sender &network_sender, playturn_network_adapter &network_reader);
~turn_info();
@ -68,8 +68,6 @@ private:
void do_save();
unsigned int team_num_;
replay_network_sender& replay_sender_;
events::generic_event host_transfer_;