CHG: Pause tool unpauses server waiting for clients

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@11693 8aca7d54-2c30-db11-9de9-000461428c89

Author: prissi

simutrans/history.txt

@@ -26,6 +26,7 @@ Release of 124.3.1 (r11671 on 5-Apr-2025):
 	FIX: make sure, the pak path and working path are really different
 	FIX: single way tile did not force bridge direction
 	ADD: New simple tool 43 to highlught single ribi ways
+	CHG: Pause tool unpauses server waiting for clients
 
 
 Release of 124.3 (r11590 on 10-Jan-2025):

src/simutrans/tool/simtool.cc

@@ -54,6 +54,8 @@
 #include "../gui/privatesign_info.h"
 #include "../gui/messagebox.h"
 
+#include "../network/network_socket_list.h"
+
 #include "../obj/zeiger.h"
 #include "../obj/bruecke.h"
 #include "../obj/tunnel.h"
@@ -7217,6 +7219,38 @@ const char *tool_pipette_t::work(player_t *pl, koord3d pos)
 	return gr->obj_count()>0 ? "Not allowed to copy object." : NULL;
 }
 
+// pause tool also to unpause server games
+char const* tool_pause_t::get_tooltip(player_t const*) const
+{
+	if (env_t::networkmode) {
+		if (env_t::server) {
+			return translator::translate("Pause");
+		}
+		return translator::translate("deactivated in online mode");
+	}
+	return translator::translate("Pause");
+
+}
+
+bool tool_pause_t::init(player_t*)
+{
+	if (!env_t::networkmode) {
+		welt->set_fast_forward(0);
+		welt->set_pause(welt->is_paused() ^ 1);
+	}
+	else {
+		env_t::pause_server_no_clients = !env_t::pause_server_no_clients;
+		if (socket_list_t::get_playing_clients() == 0) {
+			welt->set_pause(env_t::pause_server_no_clients);
+		}
+	}
+	return false;
+}
+
+
+
+
+
 
 bool tool_show_trees_t::init( player_t* )
 {

src/simutrans/tool/simtool.h

@@ -737,17 +737,11 @@ class tool_error_message_t : public tool_t {
 class tool_pause_t : public tool_t {
 public:
 	tool_pause_t() : tool_t(TOOL_PAUSE | SIMPLE_TOOL) {}
-	char const* get_tooltip(player_t const*) const OVERRIDE { return env_t::networkmode ? translator::translate("deactivated in online mode") : translator::translate("Pause"); }
-	image_id get_icon(player_t*) const OVERRIDE { return env_t::networkmode ? IMG_EMPTY : icon; }
-	bool is_selected() const OVERRIDE { return welt->is_paused(); }
-	bool init( player_t * ) OVERRIDE {
-		if(  !env_t::networkmode  ) {
-			welt->set_fast_forward(0);
-			welt->set_pause( welt->is_paused()^1 );
-		}
-		return false;
-	}
-	bool exit(player_t *s ) OVERRIDE { return init(s); }
+	char const* get_tooltip(player_t const*) const OVERRIDE;
+	image_id get_icon(player_t*) const OVERRIDE { return (env_t::networkmode && !env_t::server) ? IMG_EMPTY : icon; }
+	bool is_selected() const { return env_t::networkmode ? env_t::pause_server_no_clients : welt->is_paused(); }
+	bool init(player_t*) OVERRIDE;
+	bool exit(player_t *s) OVERRIDE { return init(s); }
 	bool is_init_keeps_game_state() const OVERRIDE { return !env_t::networkmode; }
 	bool is_work_keeps_game_state() const OVERRIDE { return !env_t::networkmode; }
 };