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

remove an unused parameter

Browse source
This commit is contained in:
uso 2008-02-01 06:04:47 +00:00
parent 5252b564d8
commit 71243e64ed
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playcampaign.cpp
View file

@ -185,7 +185,7 @@ LEVEL_RESULT playmp_scenario(const game_data& gameinfo, const config& game_confi
}
} else {
try {
playcontroller.linger(log, res);
playcontroller.linger(log);
} catch(end_level_exception& e) {
if (e.result == QUIT) {
return QUIT;

11
src/playmp_controller.cpp
View file

@ -240,7 +240,7 @@ void playmp_controller::play_human_turn(){
menu_handler_.clear_undo_stack(player_number_);
}
void playmp_controller::linger(upload_log& log, LEVEL_RESULT result)
void playmp_controller::linger(upload_log& log)
{
LOG_NG << "beginning end-of-scenario linger\n";
browse_ = true;
@ -294,15 +294,12 @@ void playmp_controller::linger(upload_log& log, LEVEL_RESULT result)
// Loading a new game is effectively a quit.
log.quit(status_.turn());
throw;
} catch(end_level_exception& e) {
} catch(end_level_exception&) {
// Catch this error here so mp players quitting unexpectedly are not
// thrown back to the title screen
result = e.result;
} catch(end_turn_exception& e) {
result = QUIT;
} catch(end_turn_exception&) {
// Thrown when receiving [leave_game].
} catch(network::error& e) {
result = QUIT;
} catch(network::error&) {
}
// revert the end-turn button text to its normal label

2
src/playmp_controller.hpp
View file

@ -41,7 +41,7 @@ public:
bool counting_down();
void think_about_countdown(int ticks);
void process(events::pump_info &info);
void linger(upload_log& log, LEVEL_RESULT result);
void linger(upload_log& log);
//! Wait for the host to upload the next scenario.
void wait_for_upload();