(svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow)

2 files changed, 136 insertions, 0 deletions

diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini
index 968191f12..8f7861942 100644
--- a/src/table/gameopt_settings.ini
+++ b/src/table/gameopt_settings.ini
@@ -25,6 +25,7 @@ static const char *_server_langs = "ANY|ENGLISH|GERMAN|FRENCH|BRAZILIAN|BULGARIA
 #endif /* ENABLE_NETWORK */
 static const char *_osk_activation = "disabled|double|single|immediately";
 static const char *_settings_profiles = "easy|medium|hard";
+static const char *_news_display = "off|summarized|full";
 
 static const SettingDesc _gameopt_settings[] = {
 	/* In version 4 a new difficulty setting has been added to the difficulty settings,
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 95c33e95d..ec74265a1 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2969,6 +2969,141 @@ flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 def      = false
 cat      = SC_BASIC
 
+[SDTC_OMANY]
+var      = news_display.arrival_player
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.arrival_other
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.accident
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.company_info
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.open
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.close
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.economy
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.production_player
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.production_other
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 0
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.production_nobody
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 0
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.advice
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.new_vehicles
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.acceptance
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.subsidies
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 1
+max      = 2
+full     = _news_display
+
+[SDTC_OMANY]
+var      = news_display.general
+type     = SLE_UINT8
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+guiflags = SGF_MULTISTRING
+def      = 2
+max      = 2
+full     = _news_display
+
 [SDTC_VAR]
 ifdef    = ENABLE_NETWORK
 var      = gui.network_chat_box_width