Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-01-25 22:53:44 +03:00
parent 9b6d667a54 4c1dfdefa6
commit c47930887b
1111 changed files with 23665 additions and 81723 deletions
@@ -131,7 +131,7 @@ Sprite *Blitter_32bppSimple::Encode(const SpriteLoader::Sprite *sprite, Allocato
 			dst[i].v = DEFAULT_BRIGHTNESS;
 		} else {
 			/* Get brightest value */
-			uint8 rgb_max = max(src->r, max(src->g, src->b));
+			uint8 rgb_max = std::max({src->r, src->g, src->b});

 			/* Black pixel (8bpp or old 32bpp image), so use default value */
 			if (rgb_max == 0) rgb_max = DEFAULT_BRIGHTNESS;