dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7823) -Fix (r7384 / r7368 / r3757 / r7388): News windows could still cause crashes because

Browse Source 
DeleteVehicleNews shuffles around _news_items which can wreak havoc with the NewsItem*
 of a currently open news window. While here also correctly update _current_news and
 _forced_news for the same reasons. Should really work now.
This commit is contained in:
Darkvater
2007-01-04 17:23:55 +00:00
parent 6851608c00
commit 2fda7e6c10
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/news_gui.c
View File

@@ -287,6 +287,9 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
_oldest_news = increaseIndex(_oldest_news); _oldest_news = increaseIndex(_oldest_news);
} }
/*DEBUG(misc, 0) ("+cur %3d, old %2d, lat %3d, for %3d, tot %2d",
_current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
{ /* Add news to _latest_news */ { /* Add news to _latest_news */
Window *w; Window *w;
NewsItem *ni = &_news_items[_latest_news]; NewsItem *ni = &_news_items[_latest_news];
@@ -314,7 +317,7 @@ void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
} }
// don't show item if it's older than x days /* Don't show item if it's older than x days, corresponds with NewsType in news.h */
static const byte _news_items_age[] = {60, 60, 90, 60, 90, 30, 150, 30, 90, 180}; static const byte _news_items_age[] = {60, 60, 90, 60, 90, 30, 150, 30, 90, 180};
static const Widget _news_type13_widgets[] = { static const Widget _news_type13_widgets[] = {
@@ -438,6 +441,10 @@ static void ShowNewspaper(NewsItem *ni)
break; break;
} }
} }
/*DEBUG(misc, 0) (" cur %3d, old %2d, lat %3d, for %3d, tot %2d",
_current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
WP(w, news_d).ni = &_news_items[_forced_news == INVALID_NEWS ? _current_news : _forced_news]; WP(w, news_d).ni = &_news_items[_forced_news == INVALID_NEWS ? _current_news : _forced_news];
w->flags4 |= WF_DISABLE_VP_SCROLL; w->flags4 |= WF_DISABLE_VP_SCROLL;
} }
@@ -885,9 +892,9 @@ void DeleteVehicleNews(VehicleID vid, StringID news)
if (_forced_news == n || _current_news == n) MoveToNextItem(); if (_forced_news == n || _current_news == n) MoveToNextItem();
_total_news--; _total_news--;
// If this is the last news item, invalidate _latest_news /* If this is the last news item, invalidate _latest_news */
if (_latest_news == _oldest_news) { if (_total_news == 0) {
assert(_total_news == 0); assert(_latest_news == _oldest_news);
_latest_news = INVALID_NEWS; _latest_news = INVALID_NEWS;
} }
@@ -898,18 +905,30 @@ void DeleteVehicleNews(VehicleID vid, StringID news)
* [------O--------n-----L--] * [------O--------n-----L--]
* will become (change dramatized to make clear) * will become (change dramatized to make clear)
* [---------O-----------L--] * [---------O-----------L--]
* Also update the current news item in case it was pointing to the * We also need an update of the current, forced and visible (open window)
* oldest, now shifted item */ * news's as this shifting could change the items they were pointing to */
if (_total_news != 0) { if (_total_news != 0) {
NewsID i; NewsID i, visible_news;
for (i = n; i != _oldest_news; i = decreaseIndex(i)) { w = FindWindowById(WC_NEWS_WINDOW, 0);
_news_items[i] = _news_items[decreaseIndex(i)]; visible_news = (w != NULL) ? (NewsID)(WP(w, news_d).ni - _news_items) : INVALID_NEWS;
}
i = n;
do {
_news_items[i] = _news_items[decreaseIndex(i)];
if (i == _current_news) _current_news = increaseIndex(_current_news);
if (i == _forced_news) _forced_news = increaseIndex(_forced_news);
if (i == visible_news) WP(w, news_d).ni = &_news_items[increaseIndex(visible_news)];
i = decreaseIndex(i);
} while (i != _oldest_news);
if (_current_news == _oldest_news) _current_news = increaseIndex(_current_news);
_oldest_news = increaseIndex(_oldest_news); _oldest_news = increaseIndex(_oldest_news);
} }
/*DEBUG(misc, 0) ("-cur %3d, old %2d, lat %3d, for %3d, tot %2d",
_current_news, _oldest_news, _latest_news, _forced_news, _total_news); */
w = FindWindowById(WC_MESSAGE_HISTORY, 0); w = FindWindowById(WC_MESSAGE_HISTORY, 0);
if (w != NULL) { if (w != NULL) {
SetWindowDirty(w); SetWindowDirty(w);