upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 07:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove tgame_mode::LINGER_SP and tgame_mode::LINGER_MP

Browse Source 
they already had the same effect so i merged both options into just
tgame_mode::LINGER
This commit is contained in:
gfgtdf 2015-10-05 22:12:25 +00:00
parent b742542b37
commit 397014a89d
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game_display.hpp
View File

@ -214,8 +214,7 @@ public:
*/ */
enum tgame_mode { enum tgame_mode {
RUNNING, /**< no linger overlay, show fog and shroud. */ RUNNING, /**< no linger overlay, show fog and shroud. */
LINGER_SP, /**< linger overlay, show fog and shroud. */ LINGER }; /**< linger overlay, show fog and shroud. */
LINGER_MP }; /**< linger overlay, show fog and shroud. */
void set_game_mode(const tgame_mode game_mode); void set_game_mode(const tgame_mode game_mode);

2
src/playmp_controller.cpp
View File

@ -238,7 +238,7 @@ void playmp_controller::linger()
linger_ = true; linger_ = true;
// If we need to set the status depending on the completion state // If we need to set the status depending on the completion state
// we're needed here. // we're needed here.
gui_->set_game_mode(game_display::LINGER_MP); gui_->set_game_mode(game_display::LINGER);
// End all unit moves // End all unit moves
gamestate().board_.set_all_units_user_end_turn(); gamestate().board_.set_all_units_user_end_turn();

2
src/playsingle_controller.cpp
View File

@ -452,7 +452,7 @@ void playsingle_controller::linger()
// If we need to set the status depending on the completion state // If we need to set the status depending on the completion state
// the key to it is here. // the key to it is here.
gui_->set_game_mode(game_display::LINGER_SP); gui_->set_game_mode(game_display::LINGER);
// change the end-turn button text to its alternate label // change the end-turn button text to its alternate label
gui_->get_theme().refresh_title2("button-endturn", "title2"); gui_->get_theme().refresh_title2("button-endturn", "title2");