fix strict compilation (fixes up HEAD^)
This commit is contained in:
parent
5732ed504d
commit
3c69e774f9
2 changed files with 1 additions and 2 deletions
|
@ -3323,7 +3323,6 @@ void menu_handler::user_command()
|
|||
void menu_handler::request_control_change ( int side_num, const std::string& player )
|
||||
{
|
||||
std::string side = str_cast(side_num);
|
||||
int current_side = resources::controller->current_side();
|
||||
if (teams_[side_num - 1].is_local_human() && player == preferences::login()) {
|
||||
//this is already our side.
|
||||
return;
|
||||
|
|
|
@ -96,8 +96,8 @@ team::team_info::team_info() :
|
|||
objectives(),
|
||||
objectives_changed(false),
|
||||
controller(),
|
||||
proxy_controller(team::PROXY_HUMAN),
|
||||
defeat_condition(team::NO_LEADER),
|
||||
proxy_controller(team::PROXY_HUMAN),
|
||||
share_maps(false),
|
||||
share_view(false),
|
||||
disallow_observers(false),
|
||||
|
|
Loading…
Add table
Reference in a new issue