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

fixed some multiplayer lobby bugs

Browse source
This commit is contained in:
uid68803 2004-01-06 15:36:37 +00:00
parent 1a8c18d920
commit ecd643a909
3 changed files with 17 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
images/misc/lobby.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 175 KiB

8
src/multiplayer.cpp
View file

@ -563,9 +563,8 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
//if there are less sides in the configuration than there are starting
//positions, then generate the additional sides
const int map_positions = map.num_valid_starting_positions();
std::cerr << "map_positions: " << map_positions << "\n";
for(int pos = level_ptr->get_children("side").size(); pos < map_positions; ++pos) {
std::cerr << "adding side...\n";
config& side = level_ptr->add_child("side");
side["enemy"] = "1";
char buf[50];
@ -576,6 +575,11 @@ int play_multiplayer(display& disp, game_data& units_data, config cfg,
side["controller"] = "human";
}
//if there are too many sides, remove some
while(level_ptr->get_children("side").size() > map_positions) {
level_ptr->remove_child("side",level_ptr->get_children("side").size()-1);
}
const scoped_sdl_surface mini(image::getMinimap(145,145,map));
if(mini != NULL) {

35
src/multiplayer_connect.cpp
View file

@ -223,8 +223,14 @@ void mp_connect::lists_init()
config::child_iterator sd;
for(sd = sides.first; sd != sides.second; ++sd) {
const int team_num = sd - sides.first;
const std::string& team_name = (**sd)["team_name"];
std::stringstream str;
str << string_table["team"] << " " << team_num+1;
str << string_table["team"] << " ";
if(team_name.empty() == false)
str << team_name;
else
str << (team_num+1);
player_teams_.push_back(str.str());
}
@ -370,28 +376,9 @@ void mp_connect::gui_update()
}
}
//Player Team
if (side["team_name"] == "Team1") {
combos_team_[n].set_selected(0);
} else if (side["team_name"] == "Team2") {
combos_team_[n].set_selected(1);
} else if (side["team_name"] == "Team3") {
combos_team_[n].set_selected(2);
} else if (side["team_name"] == "Team4") {
combos_team_[n].set_selected(3);
} else if (side["team_name"] == "Team5") {
combos_team_[n].set_selected(4);
} else if (side["team_name"] == "Team6") {
combos_team_[n].set_selected(5);
} else if (side["team_name"] == "Team7") {
combos_team_[n].set_selected(6);
} else if (side["team_name"] == "Team8") {
combos_team_[n].set_selected(7);
} else if (side["team_name"] == "Team9") {
combos_team_[n].set_selected(8);
} else if (side["team_name"] == "Team10") {
combos_team_[n].set_selected(9);
}
const std::string& team_name = side["team_name"];
if(team_name != "" && isdigit(team_name[0]))
combos_team_[n].set_selected(team_name[0] - '1');
//Player Color
@ -486,7 +473,7 @@ int mp_connect::gui_do()
if(!save_) {
if(combos_team_[n].process(mousex, mousey, left_button)) {
std::stringstream str;
str << "Team" << n;
str << (combos_team_[n].selected()+1);
side["team_name"] = str.str();
}
} else {