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

Make errors translatable

Browse source 
Don't load a multiplayer game if you were not part of it
This commit is contained in:
uid68698 2004-01-13 00:21:39 +00:00
parent 2c68c8304c
commit b5c472b26d
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/translations/english.cfg
View file

@ -438,6 +438,8 @@ player_type="Player/Type"
race="Race"
team="Team"
color="Color"
error_no_mp_sides="No multiplayer sides."
error_not_part_of_game="Your not part of this save game."
#Races
elves="Elves"

27
src/multiplayer_connect.cpp
View file

@ -83,9 +83,6 @@ int mp_connect::load_map(int map, int num_turns, int village_gold,
const std::string game = dialogs::load_game_dialog(*disp_, &show_replay);
if(game == "")
{
gui::show_dialog(*disp_, NULL, "",
"Sae Game Error, game == \"\"",
gui::OK_ONLY);
status_ = -1;
return status_;
}
@ -174,7 +171,7 @@ int mp_connect::load_map(int map, int num_turns, int village_gold,
if(sides.first == sides.second || possible_sides.empty()) {
gui::show_dialog(*disp_, NULL, "",
"No multiplayer sides found.",
string_table["error_no_mp_sides"],
gui::OK_ONLY);
std::cerr << "no multiplayer sides found\n";
status_ = -1;
@ -182,6 +179,22 @@ int mp_connect::load_map(int map, int num_turns, int village_gold,
}
config::child_iterator sd;
if(save_ == true) {
bool found = false;
for(sd = sides.first; sd != sides.second; ++sd) {
if ((**sd)["description"] == preferences::login())
found = true;
}
if (found == false) {
gui::show_dialog(*disp_, NULL, "",
string_table["error_no_part_of_game"],
gui::OK_ONLY);
status_ = -1;
return status_;
}
}
bool first = true;
for(sd = sides.first; sd != sides.second; ++sd) {
if(save_ == false)
@ -417,6 +430,8 @@ void mp_connect::gui_update()
if (side["description"] == "") {
combos_type_[n].set_selected(0);
} else if (side["description"] == "Computer Player") {
//When loading a game you did not create AI players are marked
//as network players, set back to AI
combos_type_[n].set_selected(2);
} else {
for (size_t m = 0; m != player_types_.size(); ++m) {
@ -428,6 +443,10 @@ void mp_connect::gui_update()
} else if (side["controller"] == "human") {
if (side["description"] == preferences::login()) {
combos_type_[n].set_selected(4);
} else if (side["description"] != "") {
//When loading a game and you use a name not originally used during
//the initial game, mark that original slot as network
combos_type_[n].set_selected(0);
} else {
combos_type_[n].set_selected(1);
}