Fix: #10735: {POP_COLOUR} fails if string is drawn with extra flags.

2023-04-28 21:07:56 +01:00
parent 3ed8c35dfe
commit 23c46e1abf
2 changed files with 5 additions and 1 deletions
--- a/src/gfx_layout.h
+++ b/src/gfx_layout.h
@@ -47,7 +47,8 @@ struct FontState {
 	 */
 	inline void SetColour(TextColour c)
 	{
-		assert(c >= TC_BLUE && c <= TC_BLACK);
+		assert((c & TC_COLOUR_MASK) >= TC_BLUE && (c & TC_COLOUR_MASK) <= TC_BLACK);
+		assert((c & (TC_COLOUR_MASK | TC_FLAGS_MASK)) == c);
 		if ((this->cur_colour & TC_FORCED) == 0) this->cur_colour = c;
 	}