Changeset - r28535:cfbb61dd2d47
[Not reviewed]
master
0 21 0
Peter Nelson - 3 months ago 2024-01-21 13:23:04
peter1138@openttd.org
Codechange: Store Colours in Colours type. (#11625)

This reduces casts, some magic numbers, and introduces a bit of type-safety.
21 files changed with 50 insertions and 41 deletions:
0 comments (0 inline, 0 general)
src/company_base.h
Show inline comments
 
@@ -67,7 +67,7 @@ struct CompanyProperties {
 
	byte money_fraction;             ///< Fraction of money of the company, too small to represent in #money.
 
	Money current_loan;              ///< Amount of money borrowed from the bank.
 

	
 
	byte colour;                     ///< Company colour.
 
	Colours colour;                  ///< Company colour.
 

	
 
	byte block_preview;              ///< Number of quarters that the company is not allowed to get new exclusive engine previews (see CompaniesGenStatistics).
 

	
 
@@ -105,7 +105,7 @@ struct CompanyProperties {
 
	// TODO: Change some of these member variables to use relevant INVALID_xxx constants
 
	CompanyProperties()
 
		: name_2(0), name_1(0), president_name_1(0), president_name_2(0),
 
		  face(0), money(0), money_fraction(0), current_loan(0), colour(0), block_preview(0),
 
		  face(0), money(0), money_fraction(0), current_loan(0), colour(COLOUR_BEGIN), block_preview(0),
 
		  location_of_HQ(0), last_build_coordinate(0), inaugurated_year(0),
 
		  months_of_bankruptcy(0), bankrupt_asked(0), bankrupt_timeout(0), bankrupt_value(0),
 
		  terraform_limit(0), clear_limit(0), tree_limit(0), build_object_limit(0), is_ai(false), engine_renew_list(nullptr) {}
src/company_cmd.cpp
Show inline comments
 
@@ -457,7 +457,7 @@ static Colours GenerateCompanyColour()
 

	
 
	/* Move the colours that look similar to each company's colour to the side */
 
	for (const Company *c : Company::Iterate()) {
 
		Colours pcolour = (Colours)c->colour;
 
		Colours pcolour = c->colour;
 

	
 
		for (uint i = 0; i < COLOUR_END; i++) {
 
			if (colours[i] == pcolour) {
 
@@ -559,7 +559,7 @@ Company *DoStartupNewCompany(bool is_ai,
 
	c->colour = colour;
 

	
 
	ResetCompanyLivery(c);
 
	_company_colours[c->index] = (Colours)c->colour;
 
	_company_colours[c->index] = c->colour;
 

	
 
	/* Scale the initial loan based on the inflation rounded down to the loan interval. The maximum loan has already been inflation adjusted. */
 
	c->money = c->current_loan = std::min<int64_t>((INITIAL_LOAN * _economy.inflation_prices >> 16) / LOAN_INTERVAL * LOAN_INTERVAL, _economy.max_loan);
 
@@ -991,7 +991,7 @@ CommandCost CmdSetCompanyColour(DoComman
 
	if (flags & DC_EXEC) {
 
		if (primary) {
 
			if (scheme != LS_DEFAULT) SB(c->livery[scheme].in_use, 0, 1, colour != INVALID_COLOUR);
 
			if (colour == INVALID_COLOUR) colour = (Colours)c->livery[LS_DEFAULT].colour1;
 
			if (colour == INVALID_COLOUR) colour = c->livery[LS_DEFAULT].colour1;
 
			c->livery[scheme].colour1 = colour;
 

	
 
			/* If setting the first colour of the default scheme, adjust the
 
@@ -1004,7 +1004,7 @@ CommandCost CmdSetCompanyColour(DoComman
 
			}
 
		} else {
 
			if (scheme != LS_DEFAULT) SB(c->livery[scheme].in_use, 1, 1, colour != INVALID_COLOUR);
 
			if (colour == INVALID_COLOUR) colour = (Colours)c->livery[LS_DEFAULT].colour2;
 
			if (colour == INVALID_COLOUR) colour = c->livery[LS_DEFAULT].colour2;
 
			c->livery[scheme].colour2 = colour;
 

	
 
			if (scheme == LS_DEFAULT) {
src/company_gui.cpp
Show inline comments
 
@@ -582,7 +582,7 @@ static const LiveryClass _livery_class[L
 
template <SpriteID TSprite = SPR_SQUARE>
 
class DropDownListColourItem : public DropDownIcon<DropDownString<DropDownListItem>> {
 
public:
 
	DropDownListColourItem(int colour, bool masked) : DropDownIcon<DropDownString<DropDownListItem>>(TSprite, PALETTE_RECOLOUR_START + (colour % COLOUR_END), colour < COLOUR_END ? _colour_dropdown[colour] : STR_COLOUR_DEFAULT, colour, masked)
 
	DropDownListColourItem(int colour, bool masked) : DropDownIcon<DropDownString<DropDownListItem>>(TSprite, GENERAL_SPRITE_COLOUR(colour % COLOUR_END), colour < COLOUR_END ? _colour_dropdown[colour] : STR_COLOUR_DEFAULT, colour, masked)
 
	{
 
	}
 
};
 
@@ -647,7 +647,12 @@ private:
 
			list.push_back(std::make_unique<DropDownListColourItem<>>(i, HasBit(used_colours, i)));
 
		}
 

	
 
		byte sel = (default_livery == nullptr || HasBit(livery->in_use, primary ? 0 : 1)) ? (primary ? livery->colour1 : livery->colour2) : default_col;
 
		byte sel;
 
		if (default_livery == nullptr || HasBit(livery->in_use, primary ? 0 : 1)) {
 
			sel = primary ? livery->colour1 : livery->colour2;
 
		} else {
 
			sel = default_col;
 
		}
 
		ShowDropDownList(this, std::move(list), sel, widget);
 
	}
 

	
 
@@ -1034,19 +1039,20 @@ public:
 
		bool local = (CompanyID)this->window_number == _local_company;
 
		if (!local) return;
 

	
 
		if (index >= COLOUR_END) index = INVALID_COLOUR;
 
		Colours colour = static_cast<Colours>(index);
 
		if (colour >= COLOUR_END) colour = INVALID_COLOUR;
 

	
 
		if (this->livery_class < LC_GROUP_RAIL) {
 
			/* Set company colour livery */
 
			for (LiveryScheme scheme = LS_DEFAULT; scheme < LS_END; scheme++) {
 
				/* Changed colour for the selected scheme, or all visible schemes if CTRL is pressed. */
 
				if (HasBit(this->sel, scheme) || (_ctrl_pressed && _livery_class[scheme] == this->livery_class && HasBit(_loaded_newgrf_features.used_liveries, scheme))) {
 
					Command<CMD_SET_COMPANY_COLOUR>::Post(scheme, widget == WID_SCL_PRI_COL_DROPDOWN, (Colours)index);
 
					Command<CMD_SET_COMPANY_COLOUR>::Post(scheme, widget == WID_SCL_PRI_COL_DROPDOWN, colour);
 
				}
 
			}
 
		} else {
 
			/* Setting group livery */
 
			Command<CMD_SET_GROUP_LIVERY>::Post(this->sel, widget == WID_SCL_PRI_COL_DROPDOWN, (Colours)index);
 
			Command<CMD_SET_GROUP_LIVERY>::Post(this->sel, widget == WID_SCL_PRI_COL_DROPDOWN, colour);
 
		}
 
	}
 

	
 
@@ -1149,7 +1155,7 @@ void ShowCompanyLiveryWindow(CompanyID c
 
 * @param colour the (background) colour of the gradient
 
 * @param r      position to draw the face
 
 */
 
void DrawCompanyManagerFace(CompanyManagerFace cmf, int colour, const Rect &r)
 
void DrawCompanyManagerFace(CompanyManagerFace cmf, Colours colour, const Rect &r)
 
{
 
	GenderEthnicity ge = (GenderEthnicity)GetCompanyManagerFaceBits(cmf, CMFV_GEN_ETHN, GE_WM);
 

	
src/company_manager_face.h
Show inline comments
 
@@ -236,6 +236,6 @@ inline SpriteID GetCompanyManagerFaceSpr
 
	return _cmf_info[cmfv].first_sprite[ge] + GB(cmf, _cmf_info[cmfv].offset, _cmf_info[cmfv].length);
 
}
 

	
 
void DrawCompanyManagerFace(CompanyManagerFace face, int colour, const Rect &r);
 
void DrawCompanyManagerFace(CompanyManagerFace face, Colours colour, const Rect &r);
 

	
 
#endif /* COMPANY_MANAGER_FACE_H */
src/group_cmd.cpp
Show inline comments
 
@@ -672,11 +672,11 @@ CommandCost CmdSetGroupLivery(DoCommandF
 
	if (flags & DC_EXEC) {
 
		if (primary) {
 
			SB(g->livery.in_use, 0, 1, colour != INVALID_COLOUR);
 
			if (colour == INVALID_COLOUR) colour = (Colours)GetParentLivery(g)->colour1;
 
			if (colour == INVALID_COLOUR) colour = GetParentLivery(g)->colour1;
 
			g->livery.colour1 = colour;
 
		} else {
 
			SB(g->livery.in_use, 1, 1, colour != INVALID_COLOUR);
 
			if (colour == INVALID_COLOUR) colour = (Colours)GetParentLivery(g)->colour2;
 
			if (colour == INVALID_COLOUR) colour = GetParentLivery(g)->colour2;
 
			g->livery.colour2 = colour;
 
		}
 

	
src/house.h
Show inline comments
 
@@ -113,7 +113,7 @@ struct HouseSpec {
 
	/* NewHouses properties */
 
	GRFFileProps grf_prop;                    ///< Properties related the the grf file
 
	uint16_t callback_mask;                     ///< Bitmask of house callbacks that have to be called
 
	byte random_colour[4];                    ///< 4 "random" colours
 
	Colours random_colour[4];                 ///< 4 "random" colours
 
	byte probability;                         ///< Relative probability of appearing (16 is the standard value)
 
	HouseExtraFlags extra_flags;              ///< some more flags
 
	HouseClassID class_id;                    ///< defines the class this house has (not grf file based)
src/industry.h
Show inline comments
 
@@ -102,7 +102,7 @@ struct Industry : IndustryPool::PoolItem
 

	
 
	IndustryType type;             ///< type of industry.
 
	Owner owner;                   ///< owner of the industry.  Which SHOULD always be (imho) OWNER_NONE
 
	byte random_colour;            ///< randomized colour of the industry, for display purpose
 
	Colours random_colour;         ///< randomized colour of the industry, for display purpose
 
	TimerGameCalendar::Year last_prod_year; ///< last year of production
 
	byte was_cargo_delivered;      ///< flag that indicate this has been the closest industry chosen for cargo delivery by a station. see DeliverGoodsToIndustry
 
	IndustryControlFlags ctlflags; ///< flags overriding standard behaviours
src/industry_cmd.cpp
Show inline comments
 
@@ -1778,7 +1778,7 @@ static void DoCreateNewIndustry(Industry
 
	i->owner = OWNER_NONE;
 

	
 
	uint16_t r = Random();
 
	i->random_colour = GB(r, 0, 4);
 
	i->random_colour = static_cast<Colours>(GB(r, 0, 4));
 
	i->counter = GB(r, 4, 12);
 
	i->random = initial_random_bits;
 
	i->was_cargo_delivered = false;
 
@@ -1832,7 +1832,7 @@ static void DoCreateNewIndustry(Industry
 
		uint16_t res = GetIndustryCallback(CBID_INDUSTRY_DECIDE_COLOUR, 0, 0, i, type, INVALID_TILE);
 
		if (res != CALLBACK_FAILED) {
 
			if (GB(res, 4, 11) != 0) ErrorUnknownCallbackResult(indspec->grf_prop.grffile->grfid, CBID_INDUSTRY_DECIDE_COLOUR, res);
 
			i->random_colour = GB(res, 0, 4);
 
			i->random_colour = static_cast<Colours>(GB(res, 0, 4));
 
		}
 
	}
 

	
src/linkgraph/linkgraph_gui.cpp
Show inline comments
 
@@ -332,7 +332,7 @@ void LinkGraphOverlay::DrawStationDots(c
 

	
 
		LinkGraphOverlay::DrawVertex(pt.x, pt.y, r,
 
				_colour_gradient[st->owner != OWNER_NONE ?
 
						(Colours)Company::Get(st->owner)->colour : COLOUR_GREY][5],
 
						Company::Get(st->owner)->colour : COLOUR_GREY][5],
 
				_colour_gradient[COLOUR_GREY][1]);
 
	}
 
}
src/livery.h
Show inline comments
 
@@ -11,6 +11,7 @@
 
#define LIVERY_H
 

	
 
#include "company_type.h"
 
#include "gfx_type.h"
 

	
 
static const byte LIT_NONE    = 0; ///< Don't show the liveries at all
 
static const byte LIT_COMPANY = 1; ///< Show the liveries of your own company
 
@@ -76,8 +77,8 @@ DECLARE_ENUM_AS_ADDABLE(LiveryClass)
 
/** Information about a particular livery. */
 
struct Livery {
 
	byte in_use;  ///< Bit 0 set if this livery should override the default livery first colour, Bit 1 for the second colour.
 
	byte colour1; ///< First colour, for all vehicles.
 
	byte colour2; ///< Second colour, for vehicles with 2CC support.
 
	Colours colour1; ///< First colour, for all vehicles.
 
	Colours colour2; ///< Second colour, for vehicles with 2CC support.
 
};
 

	
 
void ResetCompanyLivery(Company *c);
src/main_gui.cpp
Show inline comments
 
@@ -541,7 +541,7 @@ void ShowSelectGameWindow();
 
void SetupColoursAndInitialWindow()
 
{
 
	for (uint i = 0; i != 16; i++) {
 
		const byte *b = GetNonSprite(PALETTE_RECOLOUR_START + i, SpriteType::Recolour);
 
		const byte *b = GetNonSprite(GENERAL_SPRITE_COLOUR(i), SpriteType::Recolour);
 

	
 
		assert(b);
 
		memcpy(_colour_gradient[i], b + 0xC6, sizeof(_colour_gradient[i]));
src/newgrf.cpp
Show inline comments
 
@@ -2405,10 +2405,11 @@ static ChangeInfoResult TownHouseChangeI
 
					housespec->grf_prop.local_id = hid + i;
 
					housespec->grf_prop.subst_id = subs_id;
 
					housespec->grf_prop.grffile = _cur.grffile;
 
					housespec->random_colour[0] = 0x04;  // those 4 random colours are the base colour
 
					housespec->random_colour[1] = 0x08;  // for all new houses
 
					housespec->random_colour[2] = 0x0C;  // they stand for red, blue, orange and green
 
					housespec->random_colour[3] = 0x06;
 
					/* Set default colours for randomization, used if not overridden. */
 
					housespec->random_colour[0] = COLOUR_RED;
 
					housespec->random_colour[1] = COLOUR_BLUE;
 
					housespec->random_colour[2] = COLOUR_ORANGE;
 
					housespec->random_colour[3] = COLOUR_GREEN;
 

	
 
					/* House flags 40 and 80 are exceptions; these flags are never set automatically. */
 
					housespec->building_flags &= ~(BUILDING_IS_CHURCH | BUILDING_IS_STADIUM);
 
@@ -2502,7 +2503,7 @@ static ChangeInfoResult TownHouseChangeI
 
				break;
 

	
 
			case 0x17: // Four random colours to use
 
				for (uint j = 0; j < 4; j++) housespec->random_colour[j] = buf->ReadByte();
 
				for (uint j = 0; j < 4; j++) housespec->random_colour[j] = static_cast<Colours>(GB(buf->ReadByte(), 0, 4));
 
				break;
 

	
 
			case 0x18: // Relative probability of appearing
src/newgrf_house.cpp
Show inline comments
 
@@ -429,7 +429,7 @@ static void DrawTileLayout(const TileInf
 
	const DrawTileSprites *dts = group->ProcessRegisters(&stage);
 

	
 
	const HouseSpec *hs = HouseSpec::Get(house_id);
 
	PaletteID palette = hs->random_colour[TileHash2Bit(ti->x, ti->y)] + PALETTE_RECOLOUR_START;
 
	PaletteID palette = GENERAL_SPRITE_COLOUR(hs->random_colour[TileHash2Bit(ti->x, ti->y)]);
 
	if (HasBit(hs->callback_mask, CBM_HOUSE_COLOUR)) {
 
		uint16_t callback = GetHouseCallback(CBID_HOUSE_COLOUR, 0, 0, house_id, Town::GetByTile(ti->tile), ti->tile);
 
		if (callback != CALLBACK_FAILED) {
src/news_type.h
Show inline comments
 
@@ -11,6 +11,7 @@
 
#define NEWS_TYPE_H
 

	
 
#include "core/enum_type.hpp"
 
#include "gfx_type.h"
 
#include "timer/timer_game_calendar.h"
 
#include "strings_type.h"
 
#include "sound_type.h"
 
@@ -161,7 +162,7 @@ struct CompanyNewsInformation : NewsAllo
 
	std::string other_company_name; ///< The name of the company taking over this one
 

	
 
	uint32_t face; ///< The face of the president
 
	byte colour; ///< The colour related to the company
 
	Colours colour; ///< The colour related to the company
 

	
 
	CompanyNewsInformation(const struct Company *c, const struct Company *other = nullptr);
 
};
src/openttd.cpp
Show inline comments
 
@@ -876,11 +876,11 @@ static void MakeNewGameDone()
 
	if (_settings_client.gui.starting_colour != COLOUR_END) {
 
		c->colour = _settings_client.gui.starting_colour;
 
		ResetCompanyLivery(c);
 
		_company_colours[c->index] = (Colours)c->colour;
 
		_company_colours[c->index] = c->colour;
 
	}
 

	
 
	if (_settings_client.gui.starting_colour_secondary != COLOUR_END && HasBit(_loaded_newgrf_features.used_liveries, LS_DEFAULT)) {
 
		Command<CMD_SET_COMPANY_COLOUR>::Post(LS_DEFAULT, false, (Colours)_settings_client.gui.starting_colour_secondary);
 
		Command<CMD_SET_COMPANY_COLOUR>::Post(LS_DEFAULT, false, _settings_client.gui.starting_colour_secondary);
 
	}
 

	
 
	OnStartGame(false);
src/saveload/afterload.cpp
Show inline comments
 
@@ -2463,7 +2463,7 @@ bool AfterLoadGame()
 
	if (IsSavegameVersionBefore(SLV_148)) {
 
		for (Object *o : Object::Iterate()) {
 
			Owner owner = GetTileOwner(o->location.tile);
 
			o->colour = (owner == OWNER_NONE) ? Random() & 0xF : Company::Get(owner)->livery->colour1;
 
			o->colour = (owner == OWNER_NONE) ? static_cast<Colours>(GB(Random(), 0, 4)) : Company::Get(owner)->livery->colour1;
 
		}
 
	}
 

	
src/saveload/company_sl.cpp
Show inline comments
 
@@ -516,7 +516,7 @@ struct PLYRChunkHandler : ChunkHandler {
 
		while ((index = SlIterateArray()) != -1) {
 
			Company *c = new (index) Company();
 
			SlObject(c, slt);
 
			_company_colours[index] = (Colours)c->colour;
 
			_company_colours[index] = c->colour;
 
		}
 
	}
 

	
src/saveload/oldloader_sl.cpp
Show inline comments
 
@@ -455,10 +455,10 @@ static void FixTTOCompanies()
 
	}
 
}
 

	
 
static inline byte RemapTTOColour(byte tto)
 
static inline Colours RemapTTOColour(Colours tto)
 
{
 
	/** Lossy remapping of TTO colours to TTD colours. SVXConverter uses the same conversion. */
 
	static const byte tto_colour_remap[] = {
 
	static const Colours tto_colour_remap[] = {
 
		COLOUR_DARK_BLUE,  COLOUR_GREY,       COLOUR_YELLOW,     COLOUR_RED,
 
		COLOUR_PURPLE,     COLOUR_DARK_GREEN, COLOUR_ORANGE,     COLOUR_PALE_GREEN,
 
		COLOUR_BLUE,       COLOUR_GREEN,      COLOUR_CREAM,      COLOUR_BROWN,
 
@@ -1033,7 +1033,7 @@ static bool LoadOldCompany(LoadgameState
 
		if (c->money == 893288) c->money = c->current_loan = 100000;
 
	}
 

	
 
	_company_colours[num] = (Colours)c->colour;
 
	_company_colours[num] = c->colour;
 
	c->inaugurated_year -= CalendarTime::ORIGINAL_BASE_YEAR;
 

	
 
	return true;
src/settings_type.h
Show inline comments
 
@@ -186,8 +186,8 @@ struct GUISettings {
 
	byte   missing_strings_threshold;        ///< the number of missing strings before showing the warning
 
	uint8_t  graph_line_thickness;             ///< the thickness of the lines in the various graph guis
 
	uint8_t  osk_activation;                   ///< Mouse gesture to trigger the OSK.
 
	byte   starting_colour;                  ///< default color scheme for the company to start a new game with
 
	byte   starting_colour_secondary;        ///< default secondary color scheme for the company to start a new game with
 
	Colours starting_colour;                 ///< default color scheme for the company to start a new game with
 
	Colours starting_colour_secondary;       ///< default secondary color scheme for the company to start a new game with
 
	bool   show_newgrf_name;                 ///< Show the name of the NewGRF in the build vehicle window
 
	bool   show_cargo_in_vehicle_lists;      ///< Show the cargoes the vehicles can carry in the list windows
 
	bool   auto_remove_signals;              ///< automatically remove signals when in the way during rail construction
src/story.cpp
Show inline comments
 
@@ -143,7 +143,7 @@ void StoryPageButtonData::SetVehicleType
 
/** Get the button background colour. */
 
Colours StoryPageButtonData::GetColour() const
 
{
 
	Colours colour = (Colours)GB(this->referenced_id, 0, 8);
 
	Colours colour = static_cast<Colours>(GB(this->referenced_id, 0, 8));
 
	if (!IsValidColours(colour)) return INVALID_COLOUR;
 
	return colour;
 
}
src/table/town_land.h
Show inline comments
 
@@ -1813,7 +1813,7 @@ static_assert(lengthof(_town_draw_tile_d
 
	{mnd, mxd, p, rc, bn, rr, mg, \
 
	{ca1, ca2, ca3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
 
	{cg1, cg2, cg3, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID, CT_INVALID}, \
 
	bf, ba, true, GRFFileProps(INVALID_HOUSE_ID), 0, {0, 0, 0, 0}, \
 
	bf, ba, true, GRFFileProps(INVALID_HOUSE_ID), 0, {COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN, COLOUR_BEGIN}, \
 
	16, NO_EXTRA_FLAG, HOUSE_NO_CLASS, {0, 2, 0, 0}, 0, 0, 0}
 
/** House specifications from original data */
 
static const HouseSpec _original_house_specs[] = {
0 comments (0 inline, 0 general)