openttd-ottdgrfs: comparison src/news

equal deleted inserted replaced

-:eec5a7dcbf61
+:fcf5fb2548eb
 #include "stdafx.h"
 #include "openttd.h"
 #include "gui.h"
 #include "window_gui.h"
 #include "viewport_func.h"
-#include "news.h"
+#include "news_func.h"
 #include "settings_type.h"
 #include "transparency.h"
 #include "strings_func.h"
 #include "window_func.h"
 #include "date_func.h"
 static NewsItem _news_items[MAX_NEWS];      ///< The news FIFO queue
 static NewsID _current_news = INVALID_NEWS; ///< points to news item that should be shown next
 static NewsID _oldest_news = 0;             ///< points to first item in fifo queue
 static NewsID _latest_news = INVALID_NEWS;  ///< points to last item in fifo queue
+struct news_d {
+	uint16 follow_vehicle;
+	int32 scrollpos_x;
+	int32 scrollpos_y;
+	int32 dest_scrollpos_x;
+	int32 dest_scrollpos_y;
+	NewsItem *ni;
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(news_d));
 /** Forced news item.
 * Users can force an item by accessing the history or "last message".
 * If the message being shown was forced by the user, its index is stored in
 * _forced_news. Otherwise, \a _forced_news variable is INVALID_NEWS. */
 static NewsID _forced_news = INVALID_NEWS;
 static byte _total_news = 0; ///< Number of news items in FIFO queue @see _news_items
-void DrawNewsNewVehicleAvail(Window *w);
+void DrawNewsNewVehicleAvail(Window *w, const NewsItem *ni);
-void DrawNewsBankrupcy(Window *w);
+void DrawNewsBankrupcy(Window *w, const NewsItem *ni);
 static void MoveToNextItem();
 StringID GetNewsStringNewVehicleAvail(const NewsItem *ni);
 StringID GetNewsStringBankrupcy(const NewsItem *ni);
 }
 static void NewsWindowProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_CREATE: { // If chatbar is open at creation time, we need to go above it
+		case WE_CREATE: { // If chatbar is open at creation time, we need to go above it
-		const Window *w1 = FindWindowById(WC_SEND_NETWORK_MSG, 0);
+			const Window *w1 = FindWindowById(WC_SEND_NETWORK_MSG, 0);
-		w->message.msg = (w1 != NULL) ? w1->height : 0;
+			w->message.msg = (w1 != NULL) ? w1->height : 0;
-	} break;
+		} break;
-	case WE_PAINT: {
+		case WE_PAINT: {
-		const NewsItem *ni = WP(w, news_d).ni;
+			const NewsItem *ni = WP(w, news_d).ni;
-		ViewPort *vp;
+			switch (ni->display_mode) {
-		switch (ni->display_mode) {
+				case NM_NORMAL:
-			case NM_NORMAL:
+				case NM_THIN: {
-			case NM_THIN: {
+					DrawNewsBorder(w);
-				DrawNewsBorder(w);
+					DrawString(2, 1, STR_00C6, TC_FROMSTRING);
-				DrawString(2, 1, STR_00C6, TC_FROMSTRING);
+					SetDParam(0, ni->date);
-				SetDParam(0, ni->date);
+					DrawStringRightAligned(428, 1, STR_01FF, TC_FROMSTRING);
-				DrawStringRightAligned(428, 1, STR_01FF, TC_FROMSTRING);
+					if (!(ni->flags & NF_VIEWPORT)) {
-				if (!(ni->flags & NF_VIEWPORT)) {
+						CopyInDParam(0, ni->params, lengthof(ni->params));
-					CopyInDParam(0, ni->params, lengthof(ni->params));
+						DrawStringMultiCenter(215, ni->display_mode == NM_NORMAL ? 76 : 56,
-					DrawStringMultiCenter(215, ni->display_mode == NM_NORMAL ? 76 : 56,
+							ni->string_id, w->width - 4);
-						ni->string_id, w->width - 4);
+					} else {
-				} else {
+						/* Back up transparency options to draw news view */
-					/* Back up transparency options to draw news view */
+						TransparencyOptionBits to_backup = _transparency_opt;
-					TransparencyOptionBits to_backup = _transparency_opt;
+						_transparency_opt = 0;
-					_transparency_opt = 0;
+						DrawWindowViewport(w);
-					DrawWindowViewport(w);
+						_transparency_opt = to_backup;
-					_transparency_opt = to_backup;
+						/* Shade the viewport into gray, or color*/
-					/* Shade the viewport into gray, or color*/
+						ViewPort *vp = w->viewport;
-					vp = w->viewport;
+						GfxFillRect(vp->left - w->left, vp->top - w->top,
-					GfxFillRect(vp->left - w->left, vp->top - w->top,
+							vp->left - w->left + vp->width - 1, vp->top - w->top + vp->height - 1,
-						vp->left - w->left + vp->width - 1, vp->top - w->top + vp->height - 1,
+							(ni->flags & NF_INCOLOR ? PALETTE_TO_TRANSPARENT : PALETTE_TO_STRUCT_GREY) | (1 << USE_COLORTABLE)
-						(ni->flags & NF_INCOLOR ? PALETTE_TO_TRANSPARENT : PALETTE_TO_STRUCT_GREY) | (1 << USE_COLORTABLE)
+						);
-					);
+						CopyInDParam(0, ni->params, lengthof(ni->params));
-					CopyInDParam(0, ni->params, lengthof(ni->params));
+						DrawStringMultiCenter(w->width / 2, 20, ni->string_id, w->width - 4);
-					DrawStringMultiCenter(w->width / 2, 20, ni->string_id, w->width - 4);
+					}
+					break;
 				}
-				break;
-			}
+				case NM_CALLBACK:
+					_draw_news_callback[ni->callback](w, ni);
-			case NM_CALLBACK: {
+					break;
-				_draw_news_callback[ni->callback](w);
-				break;
+				default:
-			}
+					DrawWindowWidgets(w);
+					if (!(ni->flags & NF_VIEWPORT)) {
-			default: {
+						CopyInDParam(0, ni->params, lengthof(ni->params));
-				DrawWindowWidgets(w);
+						DrawStringMultiCenter(140, 38, ni->string_id, 276);
-				if (!(ni->flags & NF_VIEWPORT)) {
+					} else {
-					CopyInDParam(0, ni->params, lengthof(ni->params));
+						DrawWindowViewport(w);
-					DrawStringMultiCenter(140, 38, ni->string_id, 276);
+						CopyInDParam(0, ni->params, lengthof(ni->params));
-				} else {
+						DrawStringMultiCenter(w->width / 2, w->height - 16, ni->string_id, w->width - 4);
-					DrawWindowViewport(w);
+					}
-					CopyInDParam(0, ni->params, lengthof(ni->params));
+					break;
-					DrawStringMultiCenter(w->width / 2, w->height - 16, ni->string_id, w->width - 4);
+			}
+		} break;
+		case WE_CLICK: {
+			switch (e->we.click.widget) {
+			case 1: {
+				NewsItem *ni = WP(w, news_d).ni;
+				DeleteWindow(w);
+				ni->duration = 0;
+				_forced_news = INVALID_NEWS;
+			} break;
+			case 0: {
+				NewsItem *ni = WP(w, news_d).ni;
+				if (ni->flags & NF_VEHICLE) {
+					Vehicle *v = GetVehicle(ni->data_a);
+					ScrollMainWindowTo(v->x_pos, v->y_pos);
+				} else if (ni->flags & NF_TILE) {
+					if (!ScrollMainWindowToTile(ni->data_a) && ni->data_b != 0)
+						ScrollMainWindowToTile(ni->data_b);
 				}
-				break;
+			} break;
 			}
-		}
-	} break;
-	case WE_CLICK: {
-		switch (e->we.click.widget) {
-		case 1: {
-			NewsItem *ni = WP(w, news_d).ni;
-			DeleteWindow(w);
-			ni->duration = 0;
-			_forced_news = INVALID_NEWS;
 		} break;
-		case 0: {
-			NewsItem *ni = WP(w, news_d).ni;
+		case WE_KEYPRESS:
-			if (ni->flags & NF_VEHICLE) {
+			if (e->we.keypress.keycode == WKC_SPACE) {
-				Vehicle *v = GetVehicle(ni->data_a);
+				/* Don't continue. */
-				ScrollMainWindowTo(v->x_pos, v->y_pos);
+				e->we.keypress.cont = false;
-			} else if (ni->flags & NF_TILE) {
+				DeleteWindow(w);
-				if (!ScrollMainWindowToTile(ni->data_a) && ni->data_b != 0)
+			}
-					ScrollMainWindowToTile(ni->data_b);
+			break;
-			}
+		case WE_MESSAGE: // The chatbar has notified us that is was either created or closed
+			switch (e->we.message.msg) {
+				case WE_CREATE: w->message.msg = e->we.message.wparam; break;
+				case WE_DESTROY: w->message.msg = 0; break;
+			}
+			break;
+		case WE_TICK: { // Scroll up newsmessages from the bottom in steps of 4 pixels
+			int diff;
+			int y = max(w->top - 4, _screen.height - w->height - 12 - w->message.msg);
+			if (y == w->top) return;
+			if (w->viewport != NULL)
+				w->viewport->top += y - w->top;
+			diff = Delta(w->top, y);
+			w->top = y;
+			SetDirtyBlocks(w->left, w->top - diff, w->left + w->width, w->top + w->height);
 		} break;
-		}
-	} break;
-	case WE_KEYPRESS:
-		if (e->we.keypress.keycode == WKC_SPACE) {
-			/* Don't continue. */
-			e->we.keypress.cont = false;
-			DeleteWindow(w);
-		}
-		break;
-	case WE_MESSAGE: // The chatbar has notified us that is was either created or closed
-		switch (e->we.message.msg) {
-			case WE_CREATE: w->message.msg = e->we.message.wparam; break;
-			case WE_DESTROY: w->message.msg = 0; break;
-		}
-		break;
-	case WE_TICK: { // Scroll up newsmessages from the bottom in steps of 4 pixels
-		int diff;
-		int y = max(w->top - 4, _screen.height - w->height - 12 - w->message.msg);
-		if (y == w->top) return;
-		if (w->viewport != NULL)
-			w->viewport->top += y - w->top;
-		diff = Delta(w->top, y);
-		w->top = y;
-		SetDirtyBlocks(w->left, w->top - diff, w->left + w->width, w->top + w->height);
-	} break;
 	}
 }
 /**
 * Return the correct index in the pseudo-fifo
 * queue and deals with overflows when increasing the index
 */
-static inline NewsID increaseIndex(NewsID i)
+static inline NewsID IncreaseIndex(NewsID i)
 {
 	assert(i != INVALID_NEWS);
 	return (i + 1) % MAX_NEWS;
 }
 /**
 * Return the correct index in the pseudo-fifo
 * queue and deals with overflows when decreasing the index
 */
-static inline NewsID decreaseIndex(NewsID i)
+static inline NewsID DecreaseIndex(NewsID i)
 {
 	assert(i != INVALID_NEWS);
 	return (i + MAX_NEWS - 1) % MAX_NEWS;
 }
 /**
 * Add a new newsitem to be shown.
-* @param string String to display, can have special values based on parameter \a flags
+* @param string String to display, can have special values based on parameter \a display_mode
-* @param flags various control bits that will show various news-types. See macro NEWS_FLAGS()
+* @param display_mode, any of the NewsMode enums (NM_)
+* @param flags any of the NewsFlag enums (NF_)
+* @param type news category, any of the NewsType enums (NT_)
+* @param callback news callback function, any of the NewsCallback enums (DNC_)
 * @param data_a news-specific value based on news type
 * @param data_b news-specific value based on news type
-* @note flags exists of 4 byte-sized extra parameters.
-*  -# Bits  0 -  7 display_mode, any of the NewsMode enums (NM_)
-*  -# Bits  8 - 15 news flags, any of the NewsFlags enums (NF_)
-*  -# Bits 16 - 23 news category, any of the NewsType enums (NT_)
-*  -# Bits 24 - 31 news callback function, any of the NewsCallback enums (DNC_)
 *
-* If the display mode is NM_CALLBACK, special news is shown and parameter
+* @note If the display mode is NM_CALLBACK, special news is shown and parameter
 * \a string has a special meaning.
 *  - For DNC_TRAINAVAIL, DNC_ROADAVAIL, DNC_SHIPAVAIL, DNC_AIRCRAFTAVAIL messages: StringID is
 *    the index of the engine that is shown
 *
 *  - For DNC_BANKRUPCY: bytes 0-3 of StringID contains the player that is in trouble,
 *    and 4-7 contains what kind of bankrupcy message is shown.
 *    @see NewsBankrupcy
 *
 * @see NewsMode
-* @see NewsFlags
+* @see NewsFlag
 * @see NewsType
 * @see NewsCallback
 */
-void AddNewsItem(StringID string, uint32 flags, uint data_a, uint data_b)
+void AddNewsItem(StringID string, NewsMode display_mode, NewsFlag flags, NewsType type, NewsCallback callback, uint data_a, uint data_b)
 {
-	NewsID l_news;
 	if (_game_mode == GM_MENU) return;
 	/* check the rare case that the oldest (to be overwritten) news item is open */
-	if (_total_news == MAX_NEWS && (_oldest_news == _current_news || _oldest_news == _forced_news))
+	if (_total_news == MAX_NEWS && (_oldest_news == _current_news || _oldest_news == _forced_news)) {
 		MoveToNextItem();
+	}
 	if (_total_news < MAX_NEWS) _total_news++;
 	/* Increase _latest_news. If we have no news yet, use _oldest news as an
 	 * index. We cannot use 0 as _oldest_news can jump around due to
 	 * DeleteVehicleNews */
-	l_news = _latest_news;
+	NewsID l_news = _latest_news;
-	_latest_news = (_latest_news == INVALID_NEWS) ? _oldest_news : increaseIndex(_latest_news);
+	_latest_news = (_latest_news == INVALID_NEWS) ? _oldest_news : IncreaseIndex(_latest_news);
 	/* If the fifo-buffer is full, overwrite the oldest entry */
 	if (l_news != INVALID_NEWS && _latest_news == _oldest_news) {
 		assert(_total_news == MAX_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);*/
 	/* Add news to _latest_news */
-	{
+	NewsItem *ni = &_news_items[_latest_news];
-		Window *w;
+	memset(ni, 0, sizeof(*ni));
-		NewsItem *ni = &_news_items[_latest_news];
-		memset(ni, 0, sizeof(*ni));
+	ni->string_id = string;
+	ni->display_mode = display_mode;
-		ni->string_id = string;
+	ni->flags = flags;
-		ni->display_mode = (byte)flags;
-		ni->flags = (byte)(flags >> 8);
+	/* show this news message in color? */
+	if (_cur_year >= _patches.colored_news_year) ni->flags |= NF_INCOLOR;
-		/* show this news message in color? */
-		if (_cur_year >= _patches.colored_news_year) ni->flags |= NF_INCOLOR;
+	ni->type = type;
+	ni->callback = callback;
-		ni->type = (byte)(flags >> 16);
+	ni->data_a = data_a;
-		ni->callback = (byte)(flags >> 24);
+	ni->data_b = data_b;
-		ni->data_a = data_a;
+	ni->date = _date;
-		ni->data_b = data_b;
+	CopyOutDParam(ni->params, 0, lengthof(ni->params));
-		ni->date = _date;
-		CopyOutDParam(ni->params, 0, lengthof(ni->params));
+	Window *w = FindWindowById(WC_MESSAGE_HISTORY, 0);
+	if (w == NULL) return;
-		w = FindWindowById(WC_MESSAGE_HISTORY, 0);
+	SetWindowDirty(w);
-		if (w == NULL) return;
+	w->vscroll.count = _total_news;
-		SetWindowDirty(w);
-		w->vscroll.count = _total_news;
-	}
 }
 /**
 * Maximum age of news items.
-* Don't show item if it's older than x days, corresponds with NewsType in news.h
+* Don't show item if it's older than x days, corresponds with NewsType in news_type.h
 * @see NewsType
 */
 static const byte _news_items_age[NT_END] = {
 	60,  ///< NT_ARRIVAL_PLAYER
 	60,  ///< NT_ARRIVAL_OTHER
 }
 /** Open up an own newspaper window for the news item */
 static void ShowNewspaper(NewsItem *ni)
 {
-	Window *w;
-	SoundFx sound;
-	int top;
 	ni->flags &= ~NF_FORCE_BIG;
 	ni->duration = 555;
-	sound = _news_sounds[ni->type];
+	SoundFx sound = _news_sounds[ni->type];
 	if (sound != 0) SndPlayFx(sound);
-	top = _screen.height;
+	int top = _screen.height;
+	Window *w;
 	switch (ni->display_mode) {
 		case NM_NORMAL:
-		case NM_CALLBACK: {
+		case NM_CALLBACK:
 			_news_type13_desc.top = top;
 			w = AllocateWindowDesc(&_news_type13_desc);
-			if (ni->flags & NF_VIEWPORT)
+			if (ni->flags & NF_VIEWPORT) {
 				AssignWindowViewport(w, 2, 58, 0x1AA, 0x6E,
 					ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), ZOOM_LVL_NEWS);
+			}
 			break;
-		}
+		case NM_THIN:
-		case NM_THIN: {
 			_news_type2_desc.top = top;
 			w = AllocateWindowDesc(&_news_type2_desc);
-			if (ni->flags & NF_VIEWPORT)
+			if (ni->flags & NF_VIEWPORT) {
 				AssignWindowViewport(w, 2, 58, 0x1AA, 0x46,
 					ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), ZOOM_LVL_NEWS);
+			}
 			break;
-		}
+		default:
-		default: {
 			_news_type0_desc.top = top;
 			w = AllocateWindowDesc(&_news_type0_desc);
-			if (ni->flags & NF_VIEWPORT)
+			if (ni->flags & NF_VIEWPORT) {
 				AssignWindowViewport(w, 3, 17, 0x112, 0x2F,
 					ni->data_a | (ni->flags & NF_VEHICLE ? 0x80000000 : 0), ZOOM_LVL_NEWS);
+			}
 			break;
-		}
 	}
 	/*DEBUG(misc, 0, " cur %3d, old %2d, lat %3d, for %3d, tot %2d",
 	  _current_news, _oldest_news, _latest_news, _forced_news, _total_news);*/
 }
 /** Show news item in the ticker */
 static void ShowTicker(const NewsItem *ni)
 {
-	Window *w;
 	if (_news_ticker_sound) SndPlayFx(SND_16_MORSE);
 	_statusbar_news_item = *ni;
-	w = FindWindowById(WC_STATUS_BAR, 0);
+	Window *w = FindWindowById(WC_STATUS_BAR, 0);
 	if (w != NULL) WP(w, def_d).data_1 = 360;
 }
 /**
 * Are we ready to show another news item?
 * Only if nothing is in the newsticker and no newspaper is displayed
 */
 static bool ReadyForNextItem()
 {
-	const Window *w;
 	NewsID item = (_forced_news == INVALID_NEWS) ? _current_news : _forced_news;
-	NewsItem *ni;
 	if (item >= MAX_NEWS) return true;
-	ni = &_news_items[item];
+	NewsItem *ni = &_news_items[item];
 	/* Ticker message
 	 * Check if the status bar message is still being displayed? */
-	w = FindWindowById(WC_STATUS_BAR, 0);
+	const Window *w = FindWindowById(WC_STATUS_BAR, 0);
 	if (w != NULL && WP(w, const def_d).data_1 > -1280) return false;
 	/* Newspaper message, decrement duration counter */
 	if (ni->duration != 0) ni->duration--;
 	DeleteWindowById(WC_NEWS_WINDOW, 0);
 	_forced_news = INVALID_NEWS;
 	/* if we're not at the last item, then move on */
 	if (_current_news != _latest_news) {
-		NewsItem *ni;
+		_current_news = (_current_news == INVALID_NEWS) ? _oldest_news : IncreaseIndex(_current_news);
+		NewsItem *ni = &_news_items[_current_news];
-		_current_news = (_current_news == INVALID_NEWS) ? _oldest_news : increaseIndex(_current_news);
-		ni = &_news_items[_current_news];
 		/* check the date, don't show too old items */
 		if (_date - _news_items_age[ni->type] > ni->date) return;
 		switch (GetNewsDisplayValue(ni->type)) {
 {
 	if (_forced_news == INVALID_NEWS) {
 		/* 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 : decreaseIndex(_current_news));
+		ShowNewsMessage((w == NULL || (_current_news == _oldest_news)) ? _current_news : DecreaseIndex(_current_news));
 	} else if (_forced_news == _oldest_news) {
 		/* We have reached the oldest news, start anew with the latest */
 		ShowNewsMessage(_latest_news);
 	} else {
 		/* 'Scrolling' through news history show each one in turn */
-		ShowNewsMessage(decreaseIndex(_forced_news));
+		ShowNewsMessage(DecreaseIndex(_forced_news));
 	}
 }
 /* return news by number, with 0 being the most
 * @param maxw maximum width of string in pixels
 */
 static void DrawNewsString(int x, int y, uint16 color, const NewsItem *ni, uint maxw)
 {
 	char buffer[512], buffer2[512];
-	const char *ptr;
-	char *dest;
 	StringID str;
 	if (ni->display_mode == NM_CALLBACK) {
 		str = _get_news_string_callback[ni->callback](ni);
 	} else {
 	}
 	GetString(buffer, str, lastof(buffer));
 	/* Copy the just gotten string to another buffer to remove any formatting
 	 * from it such as big fonts, etc. */
-	ptr  = buffer;
+	const char *ptr = buffer;
-	dest = buffer2;
+	char *dest = buffer2;
 	WChar c_last = '\0';
 	for (;;) {
 		WChar c = Utf8Consume(&ptr);
 		if (c == 0) break;
 		/* Make a space from a newline, but ignore multiple newlines */
 static void MessageHistoryWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
-	case WE_PAINT: {
+		case WE_PAINT: {
-		int y = 19;
+			int y = 19;
-		NewsID p, show;
+			SetVScrollCount(w, _total_news);
-		SetVScrollCount(w, _total_news);
+			DrawWindowWidgets(w);
-		DrawWindowWidgets(w);
+			if (_total_news == 0) break;
-		if (_total_news == 0) break;
+			NewsID show = min(_total_news, w->vscroll.cap);
-		show = min(_total_news, w->vscroll.cap);
+			for (NewsID p = w->vscroll.pos; p < w->vscroll.pos + show; p++) {
-		for (p = w->vscroll.pos; p < w->vscroll.pos + show; p++) {
+				/* get news in correct order */
-			/* get news in correct order */
+				const NewsItem *ni = &_news_items[getNews(p)];
-			const NewsItem *ni = &_news_items[getNews(p)];
+				SetDParam(0, ni->date);
-			SetDParam(0, ni->date);
+				DrawString(4, y, STR_SHORT_DATE, TC_WHITE);
-			DrawString(4, y, STR_SHORT_DATE, TC_WHITE);
+				DrawNewsString(82, y, TC_WHITE, ni, w->width - 95);
-			DrawNewsString(82, y, TC_WHITE, ni, w->width - 95);
+				y += 12;
-			y += 12;
+			}
-		}
-		break;
-	}
-	case WE_CLICK:
-		switch (e->we.click.widget) {
-		case 3: {
-			int y = (e->we.click.pt.y - 19) / 12;
-			NewsID p = getNews(y + w->vscroll.pos);
-			if (p == INVALID_NEWS) break;
-			ShowNewsMessage(p);
 			break;
 		}
-		}
-		break;
+		case WE_CLICK:
+			if (e->we.click.widget == 3) {
-	case WE_RESIZE:
+				int y = (e->we.click.pt.y - 19) / 12;
-		w->vscroll.cap += e->we.sizing.diff.y / 12;
+				NewsID p = getNews(y + w->vscroll.pos);
-		break;
+				if (p != INVALID_NEWS) ShowNewsMessage(p);
+			}
+			break;
+		case WE_RESIZE:
+			w->vscroll.cap += e->we.sizing.diff.y / 12;
+			break;
 	}
 }
 static const Widget _message_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    13,     0,    10,     0,    13, STR_00C5,            STR_018B_CLOSE_WINDOW},
 };
 /** Display window with news messages history */
 void ShowMessageHistory()
 {
-	Window *w;
 	DeleteWindowById(WC_MESSAGE_HISTORY, 0);
-	w = AllocateWindowDesc(&_message_history_desc);
+	Window *w = AllocateWindowDesc(&_message_history_desc);
 	if (w != NULL) {
 		w->vscroll.cap = 10;
 		w->vscroll.count = _total_news;
 		w->resize.step_height = 12;
 	/* WP(w, def_d).data_1 stores state of the ALL on/off/summary button */
 	switch (e->event) {
 		case WE_CREATE: {
 			uint32 val = _news_display_opt;
 			uint32 all_val;
-			int i;
 			/* Set up the initial disabled buttons in the case of 'off' or 'full' */
 			all_val = val & 0x3;
-			for (i = 0; i < NT_END; i++, val >>= 2) {
+			for (int i = 0; i < NT_END; i++, val >>= 2) {
 				SetMessageButtonStates(w, val & 0x3, i);
 				/* If the value doesn't match the ALL-button value, set the ALL-button value to 'off' */
 				if ((val & 0x3) != all_val) all_val = 0;
 			}
 			/* If all values are the same value, the ALL-button will take over this value */
 			WP(w, def_d).data_1 = all_val;
 		} break;
 		case WE_PAINT: {
 			uint32 val = _news_display_opt;
-			int i, y;
 			if (_news_ticker_sound) w->LowerWidget(WIDGET_NEWSOPT_SOUNDTICKER);
 			w->widget[WIDGET_NEWSOPT_DROP_SUMMARY].data = message_opt[WP(w, def_d).data_1];
 			DrawWindowWidgets(w);
 			/* Draw the string of each setting on each button. */
-			for (i = 0, y = 26; i < NT_END; i++, y += 12, val >>= 2) {
+			for (int i = 0, y = 26; i < NT_END; i++, y += 12, val >>= 2) {
 				/* 51 comes from 13 + 89 (left and right of the button)+1, shiefted by one as to get division,
 				 * which will give centered position */
 				DrawStringCentered(51, y + 1, message_opt[val & 0x3], TC_BLACK);
 			}
 		} break;
 						SetMessageButtonStates(w, val, element);
 						SetNewsDisplayValue(element, val);
 						SetWindowDirty(w);
 					}
 				} break;
-			} break;
+			}
+			break;
-		case WE_DROPDOWN_SELECT: { // Select all settings for newsmessages
-			int i;
+		case WE_DROPDOWN_SELECT: // Select all settings for newsmessages
 			WP(w, def_d).data_1 = e->we.dropdown.index;
-			for (i = 0; i < NT_END; i++) {
+			for (int i = 0; i < NT_END; i++) {
 				SetMessageButtonStates(w, e->we.dropdown.index, i);
 				SetNewsDisplayValue(i, e->we.dropdown.index);
 			}
 			SetWindowDirty(w);
-		} break;
+			break;
 	}
 }
 /*
 }
 void DeleteVehicleNews(VehicleID vid, StringID news)
 {
-	NewsID n;
+	for (NewsID n = _oldest_news; _latest_news != INVALID_NEWS; n = IncreaseIndex(n)) {
-	for (n = _oldest_news; _latest_news != INVALID_NEWS; n = increaseIndex(n)) {
 		const NewsItem *ni = &_news_items[n];
 		if (ni->flags & NF_VEHICLE &&
 				ni->data_a == vid &&
 				(news == INVALID_STRING_ID || ni->string_id == news)) {
-			Window *w;
 			/* If we delete a forced news and it is just before the current news
 			 * then we need to advance to the next news (if any) */
 			if (_forced_news == n) MoveToNextItem();
 			if (_forced_news == INVALID_NEWS && _current_news == n) MoveToNextItem();
 			_total_news--;
 			 * will become (change dramatized to make clear)
 			 * [---------O-----------L--]
 			 * We also need an update of the current, forced and visible (open window)
 			 * news's as this shifting could change the items they were pointing to */
 			if (_total_news != 0) {
-				w = FindWindowById(WC_NEWS_WINDOW, 0);
+				Window *w = FindWindowById(WC_NEWS_WINDOW, 0);
 				NewsID visible_news = (w != NULL) ? (NewsID)(WP(w, news_d).ni - _news_items) : INVALID_NEWS;
-				for (NewsID i = n;; i = decreaseIndex(i)) {
+				for (NewsID i = n;; i = DecreaseIndex(i)) {
-					_news_items[i] = _news_items[decreaseIndex(i)];
+					_news_items[i] = _news_items[DecreaseIndex(i)];
 					if (i != _latest_news) {
-						if (i == _current_news) _current_news = increaseIndex(_current_news);
+						if (i == _current_news) _current_news = IncreaseIndex(_current_news);
-						if (i == _forced_news) _forced_news = increaseIndex(_forced_news);
+						if (i == _forced_news) _forced_news = IncreaseIndex(_forced_news);
-						if (i == visible_news) WP(w, news_d).ni = &_news_items[increaseIndex(visible_news)];
+						if (i == visible_news) WP(w, news_d).ni = &_news_items[IncreaseIndex(visible_news)];
 					}
 					if (i == _oldest_news) break;
 				}
-				_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);
+			Window *w = FindWindowById(WC_MESSAGE_HISTORY, 0);
 			if (w != NULL) {
 				SetWindowDirty(w);
 				w->vscroll.count = _total_news;
 			}
 		}

branch	NewGRF_ports
changeset 10184	fcf5fb2548eb
parent 6872	1c4a4a609f85
child 10210	a2131f7a315d