Merge lp:~widelands-dev/widelands/bug-1634736-victory-gamespeed into lp:widelands

[GunChleoc]

The game summary window now restores the original desired speed when it's closed.

Resume game speed when game summary window is closed. Using the desired speed is the only way to pause the game both in single- and multiplayer mode.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1926. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/200408939.
Appveyor build 1761. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1634736_victory_gamespeed-1761.

[Notabilis (notabilis27)]

Code looks good to me and in single player it works as wanted.

What do you mean with your NOCOM?

[kaputtnik (franku)]

Played the first tutorial and it works as expected.

review: Approve (testing)

[GunChleoc (gunchleoc)]

Thanks for the test and review! The NOCOM was an old note that needed to go.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/wui/game_summary.cc'
--- src/wui/game_summary.cc	2017-01-25 18:55:59 +0000
+++ src/wui/game_summary.cc	2017-02-11 11:05:58 +0000
@@ -26,6 +26,7 @@
 #include "graphic/graphic.h"
 #include "graphic/playercolor.h"
 #include "logic/game.h"
+#include "logic/game_controller.h"
 #include "logic/player.h"
 #include "logic/playersmanager.h"
 #include "ui_basic/box.h"
@@ -40,7 +41,10 @@
 #define PADDING 4
 
 GameSummaryScreen::GameSummaryScreen(InteractiveGameBase* parent, UI::UniqueWindow::Registry* r)
-   : UI::UniqueWindow(parent, "game_summary", r, 0, 0, _("Game over")), game_(parent->game()) {
+   : UI::UniqueWindow(parent, "game_summary", r, 0, 0, _("Game over")),
+     game_(parent->game()),
+     desired_speed_(game_.game_controller()->desired_speed()) {
+	game_.game_controller()->set_desired_speed(0);
 	// Init boxes
 	UI::Box* vbox = new UI::Box(this, 0, 0, UI::Box::Vertical, 0, 0, PADDING);
 	title_area_ = new UI::Textarea(vbox, "", UI::Align::kHCenter);
@@ -207,6 +211,7 @@
 }
 
 void GameSummaryScreen::continue_clicked() {
+	game_.game_controller()->set_desired_speed(desired_speed_);
 	die();
 }
 

=== modified file 'src/wui/game_summary.h'
--- src/wui/game_summary.h	2017-01-25 18:55:59 +0000
+++ src/wui/game_summary.h	2017-02-11 11:05:58 +0000
@@ -47,6 +47,7 @@
 	std::string parse_player_info(std::string info);
 
 	Widelands::Game& game_;
+	uint32_t desired_speed_;
 	UI::Textarea* title_area_;
 	UI::Textarea* gametime_label_;
 	UI::Textarea* gametime_value_;

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2017-01-25 18:55:59 +0000
+++ src/wui/interactive_gamebase.cc	2017-02-11 11:05:58 +0000
@@ -156,7 +156,6 @@
 }
 
 void InteractiveGameBase::show_game_summary() {
-	game().game_controller()->set_desired_speed(0);
 	if (game_summary_.window) {
 		game_summary_.window->set_visible(true);
 		game_summary_.window->think();