Merge branch 'master' into jgrpp

# Conflicts:
#	src/crashlog.cpp
#	src/gfx.cpp
#	src/network/network_client.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/saveload/saveload.cpp
#	src/survey.cpp

src/openttd.h

@@ -12,6 +12,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <optional>
 #include "core/enum_type.hpp"
 
 /** Mode which defines the state of the game. */
@@ -58,11 +59,16 @@ enum ExtraDisplayOptions {
 	XDO_SHOW_HIDDEN_SIGNS       = 1, ///< Show hidden signs
 };
 
+struct GameSessionStats {
+	std::optional<std::chrono::steady_clock::time_point> start_time; ///< Time when the current game was started.
+	std::string savegame_id;                                         ///< Unique ID of the savegame.
+	std::optional<size_t> savegame_size;                             ///< Size of the last saved savegame in bytes, or std::nullopt if not saved yet.
+};
+
 extern GameMode _game_mode;
 extern SwitchMode _switch_mode;
 extern bool _check_special_modes;
-extern bool _switch_mode_time_valid;
-extern std::chrono::steady_clock::time_point _switch_mode_time;
+extern GameSessionStats _game_session_stats;
 extern std::atomic<bool> _exit_game;
 extern bool _save_config;