cpp/openttd-patchpack/source Changeset - r28812:d6d9465e39a0

Changeset - r28812:d6d9465e39a0

Parent rev.

Child rev.

[Not reviewed]

master

0 23 0

Peter Nelson - 4 months ago 2023-12-24 22:51:55
peter1138@openttd.org

Codechange: Remove direct access to _colour_gradient.

Access is now through GetColourGradient, which ensures parameters are in range.

23 files changed with 98 insertions and 65 deletions:

src/bootstrap_gui.cpp

src/build_vehicle_gui.cpp

src/company_cmd.cpp

src/console_gui.cpp

src/depot_gui.cpp

src/gfx_type.h

src/graph_gui.cpp

src/group_gui.cpp

src/linkgraph/linkgraph_gui.cpp

src/main_gui.cpp

src/misc_gui.cpp

src/network/network_gui.cpp

src/order_gui.cpp

src/palette.cpp

src/palette_func.h

src/settings_gui.cpp

src/smallmap_gui.cpp

src/train_gui.cpp

src/vehicle_gui.cpp

src/viewport.cpp

src/widget.cpp

src/widgets/dropdown_type.h

src/widgets/slider.cpp

0 comments (0 inline, 0 general)

src/bootstrap_gui.cpp

➞

Show inline comments

@@ @@ -382,15 +382,15 @@ bool HandleBootstrap() @@
 	CheckForMissingGlyphs(false);
 	/* Initialise the palette. The biggest step is 'faking' some recolour sprites.
 	 * This way the mauve and gray colours work and we can show the user interface. */
 	GfxInitPalettes();
 	static const int offsets[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x80, 0, 0, 0, 0x04, 0x08 };
-	for (uint i = 0; i != 16; i++) {
+	for (Colours i = COLOUR_BEGIN; i != COLOUR_END; i++) {
 		for (int j = 0; j < 8; j++) {
-			_colour_gradient[i][j] = offsets[i] + j;
+			SetColourGradient(i, j, offsets[i] + j);
+		}
+	}
 	/* Finally ask the question. */
 	new BootstrapBackground();
 	new BootstrapAskForDownloadWindow();

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -1014,13 +1014,13 @@ void DrawEngineList(VehicleType type, co @@
 	bool rtl = _current_text_dir == TD_RTL;
 	int step_size = GetEngineListHeight(type);
 	int sprite_left  = GetVehicleImageCellSize(type, EIT_PURCHASE).extend_left;
 	int sprite_right = GetVehicleImageCellSize(type, EIT_PURCHASE).extend_right;
 	int sprite_width = sprite_left + sprite_right;
 	int circle_width = std::max(GetScaledSpriteSize(SPR_CIRCLE_FOLDED).width, GetScaledSpriteSize(SPR_CIRCLE_UNFOLDED).width);
-	int linecolour = _colour_gradient[COLOUR_ORANGE][4];
+	int linecolour = GetColourGradient(COLOUR_ORANGE, 4);
 	Rect ir      = r.WithHeight(step_size).Shrink(WidgetDimensions::scaled.matrix);
 	int sprite_y_offset = ScaleSpriteTrad(sprite_y_offsets[type]) + ir.Height() / 2;
 	Dimension replace_icon = {0, 0};
 	int count_width = 0;

src/company_cmd.cpp

➞

Show inline comments

@@ @@ -143,14 +143,14 @@ void SetLocalCompany(CompanyID new_compa @@
  * Get the colour for DrawString-subroutines which matches the colour of the company.
  * @param company Company to get the colour of.
  * @return Colour of \a company.
  */
 TextColour GetDrawStringCompanyColour(CompanyID company)
+{
 	if (!Company::IsValidID(company)) return (TextColour)_colour_gradient[COLOUR_WHITE][4] | TC_IS_PALETTE_COLOUR;
 	return (TextColour)_colour_gradient[_company_colours[company]][4] | TC_IS_PALETTE_COLOUR;
 	if (!Company::IsValidID(company)) return (TextColour)GetColourGradient(COLOUR_WHITE, 4) | TC_IS_PALETTE_COLOUR;
 	return (TextColour)GetColourGradient(_company_colours[company], 4) | TC_IS_PALETTE_COLOUR;
+}
 /**
  * Draw the icon of a company.
  * @param c Company that needs its icon drawn.
  * @param x Horizontal coordinate of the icon.
@@ @@ -474,13 +474,13 @@ static const Colours _similar_colour[COL @@
  */
 static Colours GenerateCompanyColour()
+{
 	Colours colours[COLOUR_END];
 	/* Initialize array */
-	for (uint i = 0; i < COLOUR_END; i++) colours[i] = (Colours)i;
+	for (uint i = 0; i < COLOUR_END; i++) colours[i] = static_cast<Colours>(i);
 	/* And randomize it */
 	for (uint i = 0; i < 100; i++) {
 		uint r = Random();
 		Swap(colours[GB(r, 0, 4)], colours[GB(r, 4, 4)]);
+	}

src/console_gui.cpp

➞

Show inline comments

@@ @@ -490,12 +490,12 @@ bool IsValidConsoleColour(TextColour c) @@
 	/* A normal text colour is used. */
 	if (!(c & TC_IS_PALETTE_COLOUR)) return TC_BEGIN <= c && c < TC_END;
 	/* A text colour from the palette is used; must be the company
 	 * colour gradient, so it must be one of those. */
 	c &= ~TC_IS_PALETTE_COLOUR;
 	for (uint i = COLOUR_BEGIN; i < COLOUR_END; i++) {
 		if (_colour_gradient[i][4] == c) return true;
 	for (Colours i = COLOUR_BEGIN; i < COLOUR_END; i++) {
 		if (GetColourGradient(i, 4) == c) return true;
+	}
 	return false;
+}

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -381,13 +381,13 @@ struct DepotWindow : Window { @@
 		 * This only works in two cases:
 		 *  - All vehicles use VEHICLEINFO_FULL_VEHICLE_WIDTH as reference width.
 		 *  - All vehicles are 8/8. This cannot be checked for NewGRF, so instead we check for "all vehicles are original vehicles".
 		 */
 		if (this->type == VEH_TRAIN && _consistent_train_width != 0) {
 			int w = ScaleSpriteTrad(2 * _consistent_train_width);
-			int col = _colour_gradient[wid->colour][4];
+			int col = GetColourGradient(wid->colour, 4);
 			Rect image = ir.Indent(this->header_width, rtl).Indent(this->count_width, !rtl);
 			int first_line = w + (-this->hscroll->GetPosition()) % w;
 			if (rtl) {
 				for (int x = image.right - first_line; x >= image.left; x -= w) {
 					GfxDrawLine(x, r.top, x, r.bottom, col, ScaleGUITrad(1), ScaleGUITrad(3));
+				}

src/gfx_type.h

➞

Show inline comments

@@ @@ -8,12 +8,13 @@ @@
 /** @file gfx_type.h Types related to the graphics and/or input devices. */
 #ifndef GFX_TYPE_H
 #define GFX_TYPE_H
 #include "core/endian_type.hpp"
 #include "core/enum_type.hpp"
 #include "core/geometry_type.hpp"
 #include "zoom_type.h"
 typedef uint32_t SpriteID;  ///< The number of a sprite, without mapping bits and colourtables
 typedef uint32_t PaletteID; ///< The number of the palette
 typedef uint32_t CursorID;  ///< The number of the cursor (sprite)
@@ @@ -244,12 +245,13 @@ enum Colours : byte { @@
 	COLOUR_BROWN,
 	COLOUR_GREY,
 	COLOUR_WHITE,
 	COLOUR_END,
 	INVALID_COLOUR = 0xFF,
 };
 DECLARE_POSTFIX_INCREMENT(Colours)
 DECLARE_ENUM_AS_ADDABLE(Colours)
 /** Colour of the strings, see _string_colourmap in table/string_colours.h or docs/ottd-colourtext-palette.png */
 enum TextColour {
 	TC_BEGIN       = 0x00,
 	TC_FROMSTRING  = 0x00,

src/graph_gui.cpp

➞

Show inline comments

@@ @@ -624,13 +624,13 @@ public: @@
 		this->month = mo;
 		int numd = 0;
 		for (CompanyID k = COMPANY_FIRST; k < MAX_COMPANIES; k++) {
 			const Company *c = Company::GetIfValid(k);
 			if (c != nullptr) {
-				this->colours[numd] = _colour_gradient[c->colour][6];
+				this->colours[numd] = GetColourGradient(c->colour, 6);
 				for (int j = this->num_on_x_axis, i = 0; --j >= 0;) {
 					if (j >= c->num_valid_stat_ent) {
 						this->cost[numd][i] = INVALID_DATAPOINT;
 					} else {
 						/* Ensure we never assign INVALID_DATAPOINT, as that has another meaning.
 						 * Instead, use the value just under it. Hopefully nobody will notice. */
@@ @@ -1291,14 +1291,14 @@ struct PerformanceRatingDetailWindow : W @@
 		if (!IsInsideMM(widget, WID_PRD_SCORE_FIRST, WID_PRD_SCORE_LAST + 1)) return;
 		ScoreID score_type = (ScoreID)(widget - WID_PRD_SCORE_FIRST);
 		/* The colours used to show how the progress is going */
 		int colour_done = _colour_gradient[COLOUR_GREEN][4];
 		int colour_notdone = _colour_gradient[COLOUR_RED][4];
 		int colour_done = GetColourGradient(COLOUR_GREEN, 4);
 		int colour_notdone = GetColourGradient(COLOUR_RED, 4);
 		/* Draw all the score parts */
 		int64_t val    = _score_part[company][score_type];
 		int64_t needed = _score_info[score_type].needed;
 		int   score  = _score_info[score_type].score;

src/group_gui.cpp

➞

Show inline comments

@@ @@ -259,13 +259,13 @@ private: @@
 	 * @param has_children Whether the group has children and should have a fold / unfold button.
 	 */
 	void DrawGroupInfo(int y, int left, int right, GroupID g_id, int indent = 0, bool protection = false, bool has_children = false) const
+	{
 		/* Highlight the group if a vehicle is dragged over it */
 		if (g_id == this->group_over) {
-			GfxFillRect(left + WidgetDimensions::scaled.bevel.left, y + WidgetDimensions::scaled.framerect.top, right - WidgetDimensions::scaled.bevel.right, y + this->tiny_step_height - 1 - WidgetDimensions::scaled.framerect.bottom, _colour_gradient[COLOUR_GREY][7]);
+			GfxFillRect(left + WidgetDimensions::scaled.bevel.left, y + WidgetDimensions::scaled.framerect.top, right - WidgetDimensions::scaled.bevel.right, y + this->tiny_step_height - 1 - WidgetDimensions::scaled.framerect.bottom, GetColourGradient(COLOUR_GREY, 7));
+		}
 		if (g_id == NEW_GROUP) return;
 		/* draw the selected group in white, else we draw it in black */
 		TextColour colour = g_id == this->vli.index ? TC_WHITE : TC_BLACK;
@@ @@ -627,13 +627,13 @@ public: @@
 					/* Mark vehicles which are in sub-groups (only if we are not using shared order coalescing) */
 					Rect mr = r.WithHeight(this->resize.step_height);
 					size_t max = std::min<size_t>(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->vehgroups.size());
 					for (size_t i = this->vscroll->GetPosition(); i < max; ++i) {
 						const Vehicle *v = this->vehgroups[i].GetSingleVehicle();
 						if (v->group_id != this->vli.index) {
-							GfxFillRect(mr.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[COLOUR_GREY][3], FILLRECT_CHECKER);
+							GfxFillRect(mr.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(COLOUR_GREY, 3), FILLRECT_CHECKER);
+						}
 						mr = mr.Translate(0, this->resize.step_height);
+					}
+				}
 				this->DrawVehicleListItems(this->vehicle_sel, this->resize.step_height, r);

src/linkgraph/linkgraph_gui.cpp

➞

Show inline comments

@@ @@ -309,13 +309,13 @@ void LinkGraphOverlay::DrawContent(Point @@
 		GfxDrawLine(pta.x + offset_x, pta.y, ptb.x + offset_x, ptb.y, colour, width, dash);
 	} else {
 		int offset_y = (pta.x < ptb.x ? 1 : -1) * side * width;
 		GfxDrawLine(pta.x, pta.y + offset_y, ptb.x, ptb.y + offset_y, colour, width, dash);
+	}
-	GfxDrawLine(pta.x, pta.y, ptb.x, ptb.y, _colour_gradient[COLOUR_GREY][1], width);
+	GfxDrawLine(pta.x, pta.y, ptb.x, ptb.y, GetColourGradient(COLOUR_GREY, 1), width);
+}
 /**
  * Draw dots for stations into the smallmap. The dots' sizes are determined by the amount of
  * cargo produced there, their colours by the type of cargo produced.
  */
@@ @@ -328,15 +328,15 @@ void LinkGraphOverlay::DrawStationDots(c @@
 		Point pt = this->GetStationMiddle(st);
 		if (!this->IsPointVisible(pt, dpi, 3 * width)) continue;
 		uint r = width * 2 + width * 2 * std::min(200U, i.second) / 200;
 		LinkGraphOverlay::DrawVertex(pt.x, pt.y, r,
 				_colour_gradient[st->owner != OWNER_NONE ?
 						Company::Get(st->owner)->colour : COLOUR_GREY][5],
 				_colour_gradient[COLOUR_GREY][1]);
 				GetColourGradient(st->owner != OWNER_NONE ?
 						Company::Get(st->owner)->colour : COLOUR_GREY, 5),
 				GetColourGradient(COLOUR_GREY, 1));
+	}
+}
 /**
  * Draw a square symbolizing a producer of cargo.
  * @param x X coordinate of the middle of the vertex.

src/main_gui.cpp

➞

Show inline comments

@@ @@ -537,17 +537,18 @@ void ShowSelectGameWindow(); @@
 /**
  * Initialise the default colours (remaps and the likes), and load the main windows.
  */
 void SetupColoursAndInitialWindow()
+{
-	for (uint i = 0; i != 16; i++) {
+	for (Colours i = COLOUR_BEGIN; i != COLOUR_END; i++) {
 		const byte *b = GetNonSprite(GENERAL_SPRITE_COLOUR(i), SpriteType::Recolour);
 		assert(b);
 		memcpy(_colour_gradient[i], b + 0xC6, sizeof(_colour_gradient[i]));
 		assert(b != nullptr);
 		for (uint j = 0; j < 8; j++) {
 			SetColourGradient(i, j, b[0xC6 + j]);
+		}
+	}
 	new MainWindow(&_main_window_desc);
 	/* XXX: these are not done */
 	switch (_game_mode) {

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -791,13 +791,13 @@ void QueryString::DrawEditBox(const Wind @@
 	Rect r = wi->GetCurrentRect();
 	Rect cr = r.WithWidth(clearbtn_width, !rtl);
 	Rect fr = r.Indent(clearbtn_width, !rtl);
 	DrawFrameRect(cr, wi->colour, wi->IsLowered() ? FR_LOWERED : FR_NONE);
 	DrawSpriteIgnorePadding(rtl ? SPR_IMG_DELETE_RIGHT : SPR_IMG_DELETE_LEFT, PAL_NONE, cr, SA_CENTER);
-	if (this->text.bytes == 1) GfxFillRect(cr.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[wi->colour & 0xF][2], FILLRECT_CHECKER);
+	if (this->text.bytes == 1) GfxFillRect(cr.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(wi->colour, 2), FILLRECT_CHECKER);
 	DrawFrameRect(fr, wi->colour, FR_LOWERED | FR_DARKENED);
 	GfxFillRect(fr.Shrink(WidgetDimensions::scaled.bevel), PC_BLACK);
 	fr = fr.Shrink(WidgetDimensions::scaled.framerect);
 	/* Limit the drawing of the string inside the widget boundaries */

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1943,13 +1943,13 @@ public: @@
 			r.top = y + offset;
 			r.bottom = r.top + button->height - 1;
 			DrawFrameRect(r, button->colour, FR_NONE);
 			DrawSprite(button->sprite, PAL_NONE, r.left + WidgetDimensions::scaled.framerect.left, r.top + WidgetDimensions::scaled.framerect.top);
 			if (button->disabled) {
-				GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[button->colour & 0xF][2], FILLRECT_CHECKER);
+				GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(button->colour, 2), FILLRECT_CHECKER);
+			}
 			int width = button->width + WidgetDimensions::scaled.hsep_normal;
 			x += rtl ? width : -width;
+		}
+	}

src/order_gui.cpp

➞

Show inline comments

@@ @@ -1121,13 +1121,13 @@ public: @@
 				if (i != this->selected_order && i == this->order_over) {
 					/* Highlight dragged order destination. */
 					int top = (this->order_over < this->selected_order ? y : y + line_height) - WidgetDimensions::scaled.framerect.top;
 					int bottom = std::min(top + 2, ir.bottom);
 					top = std::max(top - 3, ir.top);
-					GfxFillRect(ir.left, top, ir.right, bottom, _colour_gradient[COLOUR_GREY][7]);
+					GfxFillRect(ir.left, top, ir.right, bottom, GetColourGradient(COLOUR_GREY, 7));
 					break;
+				}
 				y += line_height;
 				i++;
 				order = order->next;

src/palette.cpp

➞

Show inline comments

@@ @@ -20,14 +20,12 @@ @@
 #include "table/palettes.h"
 #include "safeguards.h"
 Palette _cur_palette;
 byte _colour_gradient[COLOUR_END][8];
 static std::recursive_mutex _palette_mutex; ///< To coordinate access to _cur_palette.
 /**
  * PALETTE_BITS reduces the bits-per-channel of 32bpp graphics data to allow faster palette lookups from
  * a smaller lookup table.
+ *
@@ @@ -292,6 +290,41 @@ TextColour GetContrastColour(uint8_t bac @@
 	/* Compute brightness according to http://www.w3.org/TR/AERT#color-contrast.
 	 * The following formula computes 1000 * brightness^2, with brightness being in range 0 to 255. */
 	uint sq1000_brightness = c.r * c.r * 299 + c.g * c.g * 587 + c.b * c.b * 114;
 	/* Compare with threshold brightness which defaults to 128 (50%) */
 	return sq1000_brightness < ((uint) threshold) * ((uint) threshold) * 1000 ? TC_WHITE : TC_BLACK;
+}
 /**
  * Lookup table of colour shades for all 16 colour gradients.
  * 8 colours per gradient from darkest (0) to lightest (7)
  */
 struct ColourGradients
+{
 	using ColourGradient = std::array<byte, 8>;
 	static inline std::array<ColourGradient, COLOUR_END> gradient{};
 };
 /**
  * Get colour gradient palette index.
  * @param colour Colour.
  * @param shade Shade level from 1 to 7.
  * @returns palette index of colour.
  */
 byte GetColourGradient(Colours colour, uint8_t shade)
+{
 	return ColourGradients::gradient[colour % COLOUR_END][shade % 8];
+}
 /**
  * Set colour gradient palette index.
  * @param colour Colour.
  * @param shade Shade level from 1 to 7.
  * @param palette_index Palette index to set.
  */
 void SetColourGradient(Colours colour, uint8_t shade, byte palette_index)
+{
 	assert(colour < COLOUR_END);
 	assert(shade < 8);
 	ColourGradients::gradient[colour % COLOUR_END][shade % 8] = palette_index;
+}

src/palette_func.h

➞

Show inline comments

@@ @@ -36,17 +36,14 @@ inline bool IsValidColours(Colours colou @@
+{
 	return colours < COLOUR_END;
+}
 TextColour GetContrastColour(uint8_t background, uint8_t threshold = 128);
 /**
  * All 16 colour gradients
  * 8 colours per gradient from darkest (0) to lightest (7)
  */
 extern byte _colour_gradient[COLOUR_END][8];
 byte GetColourGradient(Colours colour, uint8_t shade);
 void SetColourGradient(Colours colour, uint8_t shade, byte palette_colour);
 /**
  * Return the colour for a particular greyscale level.
  * @param level Intensity, 0 = black, 15 = white
  * @return colour
  */

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -1411,13 +1411,13 @@ uint BaseSettingEntry::Draw(GameSettings @@
 	bool rtl = _current_text_dir == TD_RTL;
 	int offset = (rtl ? -(int)_circle_size.width : (int)_circle_size.width) / 2;
 	int level_width = rtl ? -WidgetDimensions::scaled.hsep_indent : WidgetDimensions::scaled.hsep_indent;
 	int x = rtl ? right : left;
 	if (cur_row >= first_row) {
-		int colour = _colour_gradient[COLOUR_ORANGE][4];
+		int colour = GetColourGradient(COLOUR_ORANGE, 4);
 		y += (cur_row - first_row) * SETTING_HEIGHT; // Compute correct y start position
 		/* Draw vertical for parent nesting levels */
 		for (uint lvl = 0; lvl < this->level; lvl++) {
 			if (!HasBit(parent_last, lvl)) GfxDrawLine(x + offset, y, x + offset, y + SETTING_HEIGHT - 1, colour);
 			x += level_width;
@@ @@ -2906,13 +2906,13 @@ void ShowGameSettings() @@
  * @param state 0 = none clicked, 1 = first clicked, 2 = second clicked
  * @param clickable_left is the left button clickable?
  * @param clickable_right is the right button clickable?
  */
 void DrawArrowButtons(int x, int y, Colours button_colour, byte state, bool clickable_left, bool clickable_right)
+{
-	int colour = _colour_gradient[button_colour][2];
+	int colour = GetColourGradient(button_colour, 2);
 	Dimension dim = NWidgetScrollbar::GetHorizontalDimension();
 	Rect lr = {x,                  y, x + (int)dim.width     - 1, y + (int)dim.height - 1};
 	Rect rr = {x + (int)dim.width, y, x + (int)dim.width * 2 - 1, y + (int)dim.height - 1};
 	DrawFrameRect(lr, button_colour, (state == 1) ? FR_LOWERED : FR_NONE);
@@ @@ -2937,13 +2937,13 @@ void DrawArrowButtons(int x, int y, Colo @@
  * @param button_colour the colour of the button
  * @param state true = lowered
  * @param clickable is the button clickable?
  */
 void DrawDropDownButton(int x, int y, Colours button_colour, bool state, bool clickable)
+{
-	int colour = _colour_gradient[button_colour][2];
+	int colour = GetColourGradient(button_colour, 2);
 	Rect r = {x, y, x + SETTING_BUTTON_WIDTH - 1, y + SETTING_BUTTON_HEIGHT - 1};
 	DrawFrameRect(r, button_colour, state ? FR_LOWERED : FR_NONE);
 	DrawSpriteIgnorePadding(SPR_ARROW_DOWN, PAL_NONE, r, SA_CENTER);

src/smallmap_gui.cpp

➞

Show inline comments

@@ @@ -343,13 +343,13 @@ void BuildLandLegend() @@
 void BuildOwnerLegend()
+{
 	_legend_land_owners[1].colour = _heightmap_schemes[_settings_client.gui.smallmap_land_colour].default_colour;
 	int i = NUM_NO_COMPANY_ENTRIES;
 	for (const Company *c : Company::Iterate()) {
-		_legend_land_owners[i].colour = _colour_gradient[c->colour][5];
+		_legend_land_owners[i].colour = GetColourGradient(c->colour, 5);
 		_legend_land_owners[i].company = c->index;
 		_legend_land_owners[i].show_on_map = true;
 		_legend_land_owners[i].col_break = false;
 		_legend_land_owners[i].end = false;
 		_company_to_list_pos[c->index] = i;
 		i++;

src/train_gui.cpp

➞

Show inline comments

@@ @@ -73,13 +73,13 @@ static int HighlightDragPosition(int px, @@
 	if (drag_hlight_width > 0) {
 		int height = ScaleSpriteTrad(12);
 		int top = y - height / 2;
 		Rect r = {drag_hlight_left, top, drag_hlight_right, top + height - 1};
 		/* Sprite-scaling is used here as the area is from sprite size */
-		GfxFillRect(r.Shrink(ScaleSpriteTrad(1)), _colour_gradient[COLOUR_GREY][7]);
+		GfxFillRect(r.Shrink(ScaleSpriteTrad(1)), GetColourGradient(COLOUR_GREY, 7));
+	}
 	return drag_hlight_width;
+}
 /**
@@ @@ -396,13 +396,13 @@ void DrawTrainDetails(const Train *v, co @@
 			Rect dr = r.Indent(sprite_width, rtl);
 			uint num_lines = std::max(1u, (unsigned)_cargo_summary.size());
 			for (uint i = 0; i < num_lines; i++) {
 				if (vscroll_pos <= 0 && vscroll_pos > -vscroll_cap) {
 					int py = r.top - line_height * vscroll_pos + text_y_offset;
 					if (i > 0 || separate_sprite_row) {
-						if (vscroll_pos != 0) GfxFillRect(r.left, py - WidgetDimensions::scaled.matrix.top - 1, r.right, py - WidgetDimensions::scaled.matrix.top, _colour_gradient[COLOUR_GREY][5]);
+						if (vscroll_pos != 0) GfxFillRect(r.left, py - WidgetDimensions::scaled.matrix.top - 1, r.right, py - WidgetDimensions::scaled.matrix.top, GetColourGradient(COLOUR_GREY, 5));
+					}
 					switch (det_tab) {
 						case TDW_TAB_CARGO:
 							if (i < _cargo_summary.size()) {
 								TrainDetailsCargoTab(&_cargo_summary[i], dr.left, dr.right, py);
 							} else {

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -621,13 +621,13 @@ static void DrawVehicleRefitWindow(const @@
 	Rect ir = r.Shrink(WidgetDimensions::scaled.matrix);
 	uint current = 0;
 	bool rtl = _current_text_dir == TD_RTL;
 	uint iconwidth = std::max(GetSpriteSize(SPR_CIRCLE_FOLDED).width, GetSpriteSize(SPR_CIRCLE_UNFOLDED).width);
 	uint iconheight = GetSpriteSize(SPR_CIRCLE_FOLDED).height;
-	int linecolour = _colour_gradient[COLOUR_ORANGE][4];
+	int linecolour = GetColourGradient(COLOUR_ORANGE, 4);
 	int iconleft   = rtl ? ir.right - iconwidth     : ir.left;
 	int iconcenter = rtl ? ir.right - iconwidth / 2 : ir.left + iconwidth / 2;
 	int iconinner  = rtl ? ir.right - iconwidth     : ir.left + iconwidth;
 	Rect tr = ir.Indent(iconwidth + WidgetDimensions::scaled.hsep_wide, rtl);

src/viewport.cpp

➞

Show inline comments

@@ @@ -1713,13 +1713,13 @@ static void ViewportDrawStrings(ZoomLeve @@
 		if (ss.colour != INVALID_COLOUR) {
 			if (IsTransparencySet(TO_SIGNS) && ss.string_id != STR_WHITE_SIGN) {
 				/* Don't draw the rectangle.
 				 * Real colours need the TC_IS_PALETTE_COLOUR flag.
 				 * Otherwise colours from _string_colourmap are assumed. */
-				colour = (TextColour)_colour_gradient[ss.colour][6] | TC_IS_PALETTE_COLOUR;
+				colour = (TextColour)GetColourGradient(ss.colour, 6) | TC_IS_PALETTE_COLOUR;
 			} else {
 				/* Draw the rectangle if 'transparent station signs' is off,
 				 * or if we are drawing a general text sign (STR_WHITE_SIGN). */
 				DrawFrameRect(
 					x, y, x + w - 1, y + h - 1, ss.colour,
 					IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE

src/widget.cpp

➞

Show inline comments

@@ @@ -272,23 +272,23 @@ WidgetID GetWidgetFromPos(const Window * @@
 /**
  * Draw frame rectangle.
  * @param left   Left edge of the frame
  * @param top    Top edge of the frame
  * @param right  Right edge of the frame
  * @param bottom Bottom edge of the frame
- * @param colour Colour table to use. @see _colour_gradient
+ * @param colour Colour table to use. @see Colours
  * @param flags  Flags controlling how to draw the frame. @see FrameFlags
  */
 void DrawFrameRect(int left, int top, int right, int bottom, Colours colour, FrameFlags flags)
+{
 	assert(colour < COLOUR_END);
 	uint dark         = _colour_gradient[colour][3];
 	uint medium_dark  = _colour_gradient[colour][5];
 	uint medium_light = _colour_gradient[colour][6];
 	uint light        = _colour_gradient[colour][7];
 	uint dark         = GetColourGradient(colour, 3);
 	uint medium_dark  = GetColourGradient(colour, 5);
 	uint medium_light = GetColourGradient(colour, 6);
 	uint light        = GetColourGradient(colour, 7);
 	if (flags & FR_TRANSPARENT) {
 		GfxFillRect(left, top, right, bottom, PALETTE_TO_TRANSPARENT, FILLRECT_RECOLOUR);
 	} else {
 		uint interior;
@@ @@ -420,13 +420,13 @@ static inline void DrawMatrix(const Rect @@
 		row_height = resize_y;
 		num_rows = r.Height() / row_height;
 	} else {
 		row_height = r.Height() / num_rows;
+	}
-	int col = _colour_gradient[colour & 0xF][6];
+	int col = GetColourGradient(colour, 6);
 	int x = r.left;
 	for (int ctr = num_columns; ctr > 1; ctr--) {
 		x += column_width;
 		GfxFillRect(x, r.top + WidgetDimensions::scaled.bevel.top, x + WidgetDimensions::scaled.bevel.left - 1, r.bottom - WidgetDimensions::scaled.bevel.bottom, col);
+	}
@@ @@ -434,13 +434,13 @@ static inline void DrawMatrix(const Rect @@
 	x = r.top;
 	for (int ctr = num_rows; ctr > 1; ctr--) {
 		x += row_height;
 		GfxFillRect(r.left + WidgetDimensions::scaled.bevel.left, x, r.right - WidgetDimensions::scaled.bevel.right, x + WidgetDimensions::scaled.bevel.top - 1, col);
+	}
-	col = _colour_gradient[colour & 0xF][4];
+	col = GetColourGradient(colour, 4);
 	x = r.left - 1;
 	for (int ctr = num_columns; ctr > 1; ctr--) {
 		x += column_width;
 		GfxFillRect(x - WidgetDimensions::scaled.bevel.right + 1, r.top + WidgetDimensions::scaled.bevel.top, x, r.bottom - WidgetDimensions::scaled.bevel.bottom, col);
+	}
@@ @@ -466,14 +466,14 @@ static inline void DrawVerticalScrollbar @@
 	int height = NWidgetScrollbar::GetVerticalDimension().height;
 	/* draw up/down buttons */
 	DrawImageButtons(r.WithHeight(height, false),  NWID_VSCROLLBAR, colour, up_clicked,   SPR_ARROW_UP,   SA_CENTER);
 	DrawImageButtons(r.WithHeight(height, true),   NWID_VSCROLLBAR, colour, down_clicked, SPR_ARROW_DOWN, SA_CENTER);
 	int c1 = _colour_gradient[colour & 0xF][3];
 	int c2 = _colour_gradient[colour & 0xF][7];
 	int c1 = GetColourGradient(colour, 3);
 	int c2 = GetColourGradient(colour, 7);
 	/* draw "shaded" background */
 	GfxFillRect(r.left, r.top + height, r.right, r.bottom - height, c2);
 	GfxFillRect(r.left, r.top + height, r.right, r.bottom - height, c1, FILLRECT_CHECKER);
 	/* track positions. These fractions are based on original 1x dimensions, but scale better. */
@@ @@ -505,14 +505,14 @@ static inline void DrawHorizontalScrollb @@
+{
 	int width = NWidgetScrollbar::GetHorizontalDimension().width;
 	DrawImageButtons(r.WithWidth(width, false), NWID_HSCROLLBAR, colour, left_clicked,  SPR_ARROW_LEFT,  SA_CENTER);
 	DrawImageButtons(r.WithWidth(width, true),  NWID_HSCROLLBAR, colour, right_clicked, SPR_ARROW_RIGHT, SA_CENTER);
 	int c1 = _colour_gradient[colour & 0xF][3];
 	int c2 = _colour_gradient[colour & 0xF][7];
 	int c1 = GetColourGradient(colour, 3);
 	int c2 = GetColourGradient(colour, 7);
 	/* draw "shaded" background */
 	GfxFillRect(r.left + width, r.top, r.right - width, r.bottom, c2);
 	GfxFillRect(r.left + width, r.top, r.right - width, r.bottom, c1, FILLRECT_CHECKER);
 	/* track positions. These fractions are based on original 1x dimensions, but scale better. */
@@ @@ -544,14 +544,14 @@ static inline void DrawHorizontalScrollb @@
 static inline void DrawFrame(const Rect &r, Colours colour, TextColour text_colour, StringID str, StringAlignment align, FontSize fs)
+{
 	int x2 = r.left; // by default the left side is the left side of the widget
 	if (str != STR_NULL) x2 = DrawString(r.left + WidgetDimensions::scaled.frametext.left, r.right - WidgetDimensions::scaled.frametext.right, r.top, str, text_colour, align, false, fs);
 	int c1 = _colour_gradient[colour][3];
 	int c2 = _colour_gradient[colour][7];
 	int c1 = GetColourGradient(colour, 3);
 	int c2 = GetColourGradient(colour, 7);
 	/* If the frame has text, adjust the top bar to fit half-way through */
 	Rect inner = r.Shrink(ScaleGUITrad(1));
 	if (str != STR_NULL) inner.top = r.top + GetCharacterHeight(FS_NORMAL) / 2;
 	Rect outer  = inner.Expand(WidgetDimensions::scaled.bevel);
@@ @@ -642,13 +642,13 @@ static inline void DrawDebugBox(const Re @@
  */
 static inline void DrawResizeBox(const Rect &r, Colours colour, bool at_left, bool clicked, bool bevel)
+{
 	if (bevel) {
 		DrawFrameRect(r.left, r.top, r.right, r.bottom, colour, (clicked) ? FR_LOWERED : FR_NONE);
 	} else if (clicked) {
-		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[colour][6]);
+		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(colour, 6));
+	}
 	DrawSpriteIgnorePadding(at_left ? SPR_WINDOW_RESIZE_LEFT : SPR_WINDOW_RESIZE_RIGHT, PAL_NONE, r.Shrink(ScaleGUITrad(2)), at_left ? (SA_LEFT | SA_BOTTOM | SA_FORCE) : (SA_RIGHT | SA_BOTTOM | SA_FORCE));
+}
 /**
  * Draw a close box.
@@ @@ -682,13 +682,13 @@ void DrawCaption(const Rect &r, Colours @@
 	DrawFrameRect(r, colour, FR_BORDERONLY);
 	Rect ir = r.Shrink(WidgetDimensions::scaled.bevel);
 	DrawFrameRect(ir, colour, company_owned ? FR_LOWERED | FR_DARKENED | FR_BORDERONLY : FR_LOWERED | FR_DARKENED);
 	if (company_owned) {
-		GfxFillRect(ir.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[_company_colours[owner]][4]);
+		GfxFillRect(ir.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(_company_colours[owner], 4));
+	}
 	if (str != STR_NULL) {
 		Dimension d = GetStringBoundingBox(str);
 		Point p = GetAlignedPosition(r, d, align);
 		DrawString(r.left + WidgetDimensions::scaled.captiontext.left, r.right - WidgetDimensions::scaled.captiontext.left, p.y, str, text_colour, align, false, fs);
@@ @@ -1903,13 +1903,13 @@ NWidgetCore *NWidgetMatrix::GetWidgetFro @@
 	return child->GetWidgetFromPos(x, y);
+}
 /* virtual */ void NWidgetMatrix::Draw(const Window *w)
+{
 	/* Fill the background. */
-	GfxFillRect(this->GetCurrentRect(), _colour_gradient[this->colour & 0xF][5]);
+	GfxFillRect(this->GetCurrentRect(), GetColourGradient(this->colour, 5));
 	/* Set up a clipping area for the previews. */
 	bool rtl = _current_text_dir == TD_RTL;
 	DrawPixelInfo tmp_dpi;
 	if (!FillDrawPixelInfo(&tmp_dpi, this->pos_x + (rtl ? this->pip_post : this->pip_pre), this->pos_y + this->pip_pre, this->current_x - this->pip_pre - this->pip_post, this->current_y - this->pip_pre - this->pip_post)) return;
@@ @@ -2168,13 +2168,13 @@ void NWidgetBackground::Draw(const Windo @@
+	}
 	if (this->index >= 0) w->DrawWidget(r, this->index);
 	if (this->child != nullptr) this->child->Draw(w);
 	if (this->IsDisabled()) {
-		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER);
+		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(this->colour, 2), FILLRECT_CHECKER);
+	}
 	DrawOutline(w, this);
+}
 NWidgetCore *NWidgetBackground::GetWidgetFromPos(int x, int y)
@@ @@ -2413,13 +2413,13 @@ void NWidgetScrollbar::Draw(const Window @@
 		DrawHorizontalScrollbar(r, this->colour, up_lowered, middle_lowered, down_lowered, this);
 	} else {
 		DrawVerticalScrollbar(r, this->colour, up_lowered, middle_lowered, down_lowered, this);
+	}
 	if (this->IsDisabled()) {
-		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER);
+		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(this->colour, 2), FILLRECT_CHECKER);
+	}
 	DrawOutline(w, this);
+}
 /* static */ void NWidgetScrollbar::InvalidateDimensionCache()
@@ @@ -2864,13 +2864,13 @@ void NWidgetLeaf::Draw(const Window *w) @@
 		default:
 			NOT_REACHED();
+	}
 	if (this->index >= 0) w->DrawWidget(r, this->index);
 	if (this->IsDisabled()) {
-		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), _colour_gradient[this->colour & 0xF][2], FILLRECT_CHECKER);
+		GfxFillRect(r.Shrink(WidgetDimensions::scaled.bevel), GetColourGradient(this->colour, 2), FILLRECT_CHECKER);
+	}
 	DrawOutline(w, this);
+}
 /**

src/widgets/dropdown_type.h

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ public: @@
 	virtual bool Selectable() const { return true; }
 	virtual uint Height() const { return 0; }
 	virtual uint Width() const { return 0; }
 	virtual void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const
+	{
-		if (this->masked) GfxFillRect(full, _colour_gradient[bg_colour][5], FILLRECT_CHECKER);
+		if (this->masked) GfxFillRect(full, GetColourGradient(bg_colour, 5), FILLRECT_CHECKER);
+	}
 	TextColour GetColour(bool sel) const
+	{
 		if (this->shaded) return (sel ? TC_SILVER : TC_GREY) | TC_NO_SHADE;
 		return sel ? TC_WHITE : TC_BLACK;
@@ @@ -60,14 +60,14 @@ public: @@
 	bool Selectable() const override { return false; }
 	uint Height() const override { return std::max<uint>(GetCharacterHeight(TFs), this->TBase::Height()); }
 	void Draw(const Rect &full, const Rect &, bool, Colours bg_colour) const override
+	{
 		uint8_t c1 = _colour_gradient[bg_colour][3];
 		uint8_t c2 = _colour_gradient[bg_colour][7];
 		uint8_t c1 = GetColourGradient(bg_colour, 3);
 		uint8_t c2 = GetColourGradient(bg_colour, 7);
 		int mid = CenterBounds(full.top, full.bottom, 0);
 		GfxFillRect(full.left, mid - WidgetDimensions::scaled.bevel.bottom, full.right, mid - 1, c1);
 		GfxFillRect(full.left, mid, full.right, mid + WidgetDimensions::scaled.bevel.top - 1, c2);
+	}
 };

src/widgets/slider.cpp

➞

Show inline comments

@@ @@ -38,15 +38,15 @@ void DrawSliderWidget(Rect r, int min_va @@
 	const int ha = (r.bottom - r.top) / 5;
 	const int sw = ScaleGUITrad(SLIDER_WIDTH);
 	const int t = WidgetDimensions::scaled.bevel.top; /* Thickness of lines */
 	int wx1 = r.left  + sw / 2;
 	int wx2 = r.right - sw / 2;
 	if (_current_text_dir == TD_RTL) std::swap(wx1, wx2);
 	const uint shadow = _colour_gradient[COLOUR_GREY][3];
 	const uint fill = _colour_gradient[COLOUR_GREY][6];
 	const uint light = _colour_gradient[COLOUR_GREY][7];
 	const uint shadow = GetColourGradient(COLOUR_GREY, 3);
 	const uint fill = GetColourGradient(COLOUR_GREY, 6);
 	const uint light = GetColourGradient(COLOUR_GREY, 7);
 	const std::vector<Point> wedge{ Point{wx1, r.bottom - ha}, Point{wx2, r.top + ha}, Point{wx2, r.bottom - ha} };
 	GfxFillPolygon(wedge, fill);
 	GfxDrawLine(wedge[0].x, wedge[0].y, wedge[2].x, wedge[2].y, light, t);
 	GfxDrawLine(wedge[1].x, wedge[1].y, wedge[2].x, wedge[2].y, _current_text_dir == TD_RTL ? shadow : light, t);
 	GfxDrawLine(wedge[0].x, wedge[0].y, wedge[1].x, wedge[1].y, shadow, t);

0 comments (0 inline, 0 general)