diff options
| author | tron <tron@openttd.org> | 2006-03-04 17:18:13 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-04 17:18:13 +0000 |
| commit | 5913c3931bbb1ccb8283061a23f83d96c6ed1a38 (patch) | |
| tree | ef374db717e010cf07dc0523723ec0386d42c380 | |
| parent | d49ad36ed8d9e745d3b50be47d6cda2c1d78870a (diff) | |
| download | openttd-5913c3931bbb1ccb8283061a23f83d96c6ed1a38.tar.xz | |
(svn r3761) Fix two bugs in r3757
| -rw-r--r-- | news_gui.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/news_gui.c b/news_gui.c index 4bbfe3e1b..941307daf 100644 --- a/news_gui.c +++ b/news_gui.c @@ -861,7 +861,7 @@ void DeleteVehicleNews(VehicleID vid, StringID news) { byte n; - for (n = _oldest_news; _latest_news != INVALID_NEWS && n != _latest_news + 1; n = (n + 1) % MAX_NEWS) { + for (n = _oldest_news; _latest_news != INVALID_NEWS && n != (_latest_news + 1) % MAX_NEWS; n = (n + 1) % MAX_NEWS) { const NewsItem* ni = &_news_items[n]; if (ni->flags & NF_VEHICLE && @@ -883,9 +883,10 @@ void DeleteVehicleNews(VehicleID vid, StringID news) _total_news--; w = FindWindowById(WC_MESSAGE_HISTORY, 0); - if (w == NULL) return; - SetWindowDirty(w); - w->vscroll.count = _total_news; + if (w != NULL) { + SetWindowDirty(w); + w->vscroll.count = _total_news; + } } } } |