cpp/openttd-patchpack/source Changeset - r19847:78d691b0afce

Changeset - r19847:78d691b0afce

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 12 years ago 2012-12-08 17:19:09
frosch@openttd.org

(svn r24802) -Fix [FS#4224]: When displaying the previous news message, don't consider news which are turned off.

1 file changed with 19 insertions and 3 deletions:

src/news_gui.cpp

0 comments (0 inline, 0 general)

src/news_gui.cpp

➞

Show inline comments

@@ @@ -890,19 +890,35 @@ static void ShowNewsMessage(const NewsIt @@
 /** Show previous news item */
 void ShowLastNewsMessage()
+{
 	const NewsItem *ni = NULL;
 	if (_total_news == 0) {
 		return;
 	} else if (_forced_news == NULL) {
 		/* Not forced any news yet, show the current one, unless a news window is
 		 * open (which can only be the current one), then show the previous item */
 		const Window *w = FindWindowById(WC_NEWS_WINDOW, 0);
-		ShowNewsMessage((w == NULL || (_current_news == _oldest_news)) ? _current_news : _current_news->prev);
+		ni = (w == NULL || (_current_news == _oldest_news)) ? _current_news : _current_news->prev;
 	} else if (_forced_news == _oldest_news) {
 		/* We have reached the oldest news, start anew with the latest */
-		ShowNewsMessage(_latest_news);
+		ni = _latest_news;
 	} else {
 		/* 'Scrolling' through news history show each one in turn */
 		ShowNewsMessage(_forced_news->prev);
 		ni = _forced_news->prev;
+	}
 	bool wrap = false;
 	for (;;) {
 		if (_news_type_data[ni->type].display != ND_OFF) {
 			ShowNewsMessage(ni);
 			break;
+		}
 		ni = ni->prev;
 		if (ni == NULL) {
 			if (wrap) break;
 			/* We have reached the oldest news, start anew with the latest */
 			ni = _latest_news;
 			wrap = true;
+		}
+	}
+}

0 comments (0 inline, 0 general)