(svn r13325) -Codechange: split the client-side only settings from the settings stored in the savegame so there is no need to have a duplicate copy of it for new games.

1 files changed, 14 insertions, 7 deletions

diff --git a/src/settings_type.h b/src/settings_type.h
index 7d2b65ab8..b91bed690 100644
--- a/src/settings_type.h
+++ b/src/settings_type.h
@@ -265,10 +265,9 @@ struct StationSettings {
 	byte   station_spread;                   ///< amount a station may spread
 };
 
-/** All settings together. */
-struct Settings {
+/** All settings together for the game. */
+struct GameSettings {
 	DifficultySettings   difficulty;         ///< settings related to the difficulty
-	GUISettings          gui;                ///< settings related to the GUI
 	GameCreationSettings game_creation;      ///< settings used during the creation of a game (map)
 	ConstructionSettings construction;       ///< construction of things in-game
 	AISettings           ai;                 ///< what may the AI do?
@@ -279,10 +278,18 @@ struct Settings {
 	StationSettings      station;            ///< settings related to station management
 };
 
-/** The current settings. */
-extern Settings _settings;
+/** All settings that are only important for the local client. */
+struct ClientSettings {
+	GUISettings          gui;                ///< settings related to the GUI
+};
+
+/** The current settings for this game. */
+extern ClientSettings _settings_client;
+
+/** The current settings for this game. */
+extern GameSettings _settings_game;
 
-/** The settings values that are used for new games and/or modified in config file */
-extern Settings _settings_newgame;
+/** The settings values that are used for new games and/or modified in config file. */
+extern GameSettings _settings_newgame;
 
 #endif /* SETTINGS_TYPE_H */