summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-06-01 10:11:31 +0000
committerrubidium <rubidium@openttd.org>2008-06-01 10:11:31 +0000
commit92c80dab4c507d145ebf77a6d334ef5392b3a56a (patch)
tree04ef202776f5c523135cde7c3b3118fefad3c5f4
parentd19c347fd07f1a1c5d460eec7f29cdb465772b3c (diff)
downloadopenttd-92c80dab4c507d145ebf77a6d334ef5392b3a56a.tar.xz
(svn r13349) -Codechange: remove a pointless flag; the flag is set before calling a function and is then reset in the function without ever reading it. Patch by Cirdan.
-rw-r--r--src/news_gui.cpp13
-rw-r--r--src/news_type.h1
2 files changed, 3 insertions, 11 deletions
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index 1679123f0..9aefd3ef4 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -364,8 +364,6 @@ static WindowDesc _news_type0_desc = {
/** Open up an own newspaper window for the news item */
static void ShowNewspaper(NewsItem *ni)
{
- ni->flags &= ~NF_FORCE_BIG;
-
SoundFx sound = _news_type_data[_news_subtype_data[ni->subtype].type].sound;
if (sound != 0) SndPlayFx(sound);
@@ -468,12 +466,9 @@ static void MoveToNextItem()
InvalidateWindowData(WC_STATUS_BAR, 0, SBI_SHOW_REMINDER);
break;
- case ND_SUMMARY: // Summary - show ticker, but if forced big, cascade to full
- if (!(ni->flags & NF_FORCE_BIG)) {
- ShowTicker(ni);
- break;
- }
- /* Fallthrough */
+ case ND_SUMMARY: // Summary - show ticker
+ ShowTicker(ni);
+ break;
case ND_FULL: // Full - show newspaper
ShowNewspaper(ni);
@@ -616,8 +611,6 @@ static void ShowNewsMessage(NewsItem *ni)
_forced_news = ni;
if (_forced_news != NULL) {
- NewsWindow::duration = 555;
- ni->flags |= NF_FORCE_BIG;
DeleteWindowById(WC_NEWS_WINDOW, 0);
ShowNewspaper(ni);
}
diff --git a/src/news_type.h b/src/news_type.h
index 59fbc2c2a..b00115e39 100644
--- a/src/news_type.h
+++ b/src/news_type.h
@@ -74,7 +74,6 @@ enum NewsFlag {
NF_VIEWPORT = (1 << 1), ///< Does the news message have a viewport? (ingame picture of happening)
NF_TILE = (1 << 2), ///< When clicked on the news message scroll to a given tile? Tile is in data_a
NF_VEHICLE = (1 << 3), ///< When clicked on the message scroll to the vehicle? VehicleID is in data_a
- NF_FORCE_BIG = (1 << 4), ///< Force the appearance of a news message if it has already been shown (internal)
NF_INCOLOR = (1 << 5), ///< Show the newsmessage in colour, otherwise it defaults to black & white
NF_TILE2 = (1 << 6), ///< There is a second tile to scroll to; tile is in data_b
};