mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r13345) -Codechange: only one of all the NewsItem's instance duration variable, so move it so there is only once instance of that variable. Patch by Cirdan.

release/0.7
rubidium 2008-05-30 20:57:19 +00:00
parent 6d90affce0
commit 5a6f6bf067
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/news_gui.cpp
View File

@ -168,9 +168,11 @@ NewsTypeData _news_type_data[NT_END] = {
struct NewsWindow : Window { struct NewsWindow : Window {
uint16 chat_height; uint16 chat_height;
NewsItem *ni; NewsItem *ni;
static uint duration;
NewsWindow(const WindowDesc *desc, NewsItem *ni) : Window(desc), ni(ni) NewsWindow(const WindowDesc *desc, NewsItem *ni) : Window(desc), ni(ni)
{ {
NewsWindow::duration = 555;
const Window *w = FindWindowById(WC_SEND_NETWORK_MSG, 0); const Window *w = FindWindowById(WC_SEND_NETWORK_MSG, 0);
this->chat_height = (w != NULL) ? w->height : 0; this->chat_height = (w != NULL) ? w->height : 0;
@ -258,7 +260,7 @@ struct NewsWindow : Window {
{ {
switch (widget) { switch (widget) {
case 1: case 1:
this->ni->duration = 0; NewsWindow::duration = 0;
delete this; delete this;
_forced_news = NULL; _forced_news = NULL;
break; break;
@ -314,6 +316,8 @@ struct NewsWindow : Window {
} }
}; };
/* static */ uint NewsWindow::duration; ///< Remaining time for showing current news message
static const Widget _news_type13_widgets[] = { static const Widget _news_type13_widgets[] = {
{ WWT_PANEL, RESIZE_NONE, 15, 0, 429, 0, 169, 0x0, STR_NULL}, { WWT_PANEL, RESIZE_NONE, 15, 0, 429, 0, 169, 0x0, STR_NULL},
@ -361,7 +365,6 @@ static WindowDesc _news_type0_desc = {
static void ShowNewspaper(NewsItem *ni) static void ShowNewspaper(NewsItem *ni)
{ {
ni->flags &= ~NF_FORCE_BIG; ni->flags &= ~NF_FORCE_BIG;
ni->duration = 555;
SoundFx sound = _news_type_data[_news_subtype_data[ni->subtype].type].sound; SoundFx sound = _news_type_data[_news_subtype_data[ni->subtype].type].sound;
if (sound != 0) SndPlayFx(sound); if (sound != 0) SndPlayFx(sound);
@ -438,10 +441,10 @@ static bool ReadyForNextItem()
if (IsNewsTickerShown()) return false; if (IsNewsTickerShown()) return false;
/* Newspaper message, decrement duration counter */ /* Newspaper message, decrement duration counter */
if (ni->duration != 0) ni->duration--; if (NewsWindow::duration != 0) NewsWindow::duration--;
/* neither newsticker nor newspaper are running */ /* neither newsticker nor newspaper are running */
return (ni->duration == 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL); return (NewsWindow::duration == 0 || FindWindowById(WC_NEWS_WINDOW, 0) == NULL);
} }
/** Move to the next news item */ /** Move to the next news item */
@ -613,7 +616,7 @@ static void ShowNewsMessage(NewsItem *ni)
_forced_news = ni; _forced_news = ni;
if (_forced_news != NULL) { if (_forced_news != NULL) {
ni->duration = 555; NewsWindow::duration = 555;
ni->flags |= NF_FORCE_BIG; ni->flags |= NF_FORCE_BIG;
DeleteWindowById(WC_NEWS_WINDOW, 0); DeleteWindowById(WC_NEWS_WINDOW, 0);
ShowNewspaper(ni); ShowNewspaper(ni);

1
src/news_type.h
View File

@ -104,7 +104,6 @@ struct NewsItem {
NewsItem *prev; ///< Previous news item NewsItem *prev; ///< Previous news item
NewsItem *next; ///< Next news item NewsItem *next; ///< Next news item
StringID string_id; ///< Message text StringID string_id; ///< Message text
uint16 duration; ///< Remaining time for showing this news message
Date date; ///< Date of the news Date date; ///< Date of the news
NewsSubtype subtype; ///< News subtype @see NewsSubtype NewsSubtype subtype; ///< News subtype @see NewsSubtype
NewsFlag flags; ///< NewsFlags bits @see NewsFlag NewsFlag flags; ///< NewsFlags bits @see NewsFlag