cpp/openttd-patchpack/source Changeset - r23984:68c55dd06ad8

Changeset - r23984:68c55dd06ad8

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

glx - 5 years ago 2019-11-26 00:28:03
glx@openttd.org

Add: a TextColour flag to ignore colour changes from strings

3 files changed with 3 insertions and 2 deletions:

src/gfx.cpp

src/gfx_layout.h

src/gfx_type.h

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -316,7 +316,7 @@ static void SetColourRemap(TextColour co @@
 	 * would be invisible at best, but it actually makes it illegible. */
 	bool no_shade   = (colour & TC_NO_SHADE) != 0 || colour == TC_BLACK;
 	bool raw_colour = (colour & TC_IS_PALETTE_COLOUR) != 0;
 	colour &= ~(TC_NO_SHADE | TC_IS_PALETTE_COLOUR);
+	colour &= ~(TC_NO_SHADE | TC_IS_PALETTE_COLOUR | TC_FORCED);
 	_string_colourremap[1] = raw_colour ? (byte)colour : _string_colourmap[colour];
 	_string_colourremap[2] = no_shade ? 0 : 1;

src/gfx_layout.h

➞

Show inline comments

@@ @@ -46,7 +46,7 @@ struct FontState { @@
 	inline void SetColour(TextColour c)
+	{
 		assert(c >= TC_BLUE && c <= TC_BLACK);
 		this->cur_colour = c;
+		if ((this->cur_colour & TC_FORCED) == 0) this->cur_colour = c;
+	}
 	/**

src/gfx_type.h

➞

Show inline comments

@@ @@ -267,6 +267,7 @@ enum TextColour { @@
 	TC_IS_PALETTE_COLOUR = 0x100, ///< Colour value is already a real palette colour index, not an index of a StringColour.
 	TC_NO_SHADE          = 0x200, ///< Do not add shading to this text colour.
 	TC_FORCED            = 0x400, ///< Ignore colour changes from strings.
 };
 DECLARE_ENUM_AS_BIT_SET(TextColour)

0 comments (0 inline, 0 general)