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

#13783 fixes.

Browse source
This commit is contained in:
Jon Daniel 2005-08-01 23:45:10 +00:00
parent f25564b36a
commit 32624f706b
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/multiplayer.cpp
View file

@ -345,19 +345,31 @@ void enter_lobby_mode(display& disp, const config& game_config, game_data& data,
case mp::ui::JOIN:
try {
enter_wait_mode(disp, game_config, data, chat, gamelist, false);
} catch(mp::error& err) {
if(!err.message.empty()) {
gui::show_error_message(disp, err.message);
} catch(network::error& error) {
if(!error.message.empty()) {
if(error.message == _("No multiplayer sides available in this game") ||
error.message == _("Era not available") ||
error.message == _("No multiplayer sides found")) {
gui::show_error_message(disp, error.message);
break;
}
}
throw error;
}
break;
case mp::ui::OBSERVE:
try {
enter_wait_mode(disp, game_config, data, chat, gamelist, true);
} catch(mp::error& err) {
if(!err.message.empty()) {
gui::show_error_message(disp, err.message);
} catch(network::error& error) {
if(!error.message.empty()) {
if(error.message == _("No multiplayer sides available in this game") ||
error.message == _("Era not available") ||
error.message == _("No multiplayer sides found")) {
gui::show_error_message(disp, error.message);
break;
}
}
throw error;
}
break;
case mp::ui::CREATE:

5
src/multiplayer.hpp
View file

@ -46,10 +46,5 @@ void start_server(display& disp, const config& game_config, game_data& data,
void start_client(display& disp, const config& game_config, game_data& data,
const std::string host);
struct error {
error(const std::string& msg = "") : message(msg) { }
std::string message;
};
}
#endif