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

1 files changed, 4 insertions, 7 deletions

diff --git a/src/news_type.h b/src/news_type.h
index 40b6e2c94..fee7ae38e 100644
--- a/src/news_type.h
+++ b/src/news_type.h
@@ -113,24 +113,21 @@ struct NewsTypeData {
 	const char * const name;    ///< Name
 	const byte age;             ///< Maximum age of news items (in days)
 	const SoundFx sound;        ///< Sound
-	NewsDisplay display;        ///< Display mode (off, summary, full)
-	const StringID description; ///< Description of the news type in news settings window
 
 	/**
 	 * Construct this entry.
 	 * @param name The name of the type.
 	 * @param age The maximum age for these messages.
 	 * @param sound The sound to play.
-	 * @param description The description for this type of messages.
 	 */
-	NewsTypeData(const char *name, byte age, SoundFx sound, NewsDisplay display, StringID description) :
+	NewsTypeData(const char *name, byte age, SoundFx sound) :
 		name(name),
 		age(age),
-		sound(sound),
-		display(display),
-		description(description)
+		sound(sound)
 	{
 	}
+
+	NewsDisplay GetDisplay() const;
 };
 
 /** Information about a single item of news. */