Mercurial > molko

diff libmlk-rpg/mlk/rpg/battle-indicator.c @ 461:d7874f11565f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: color -> mlk_color
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 09:46:20 +0100
parents 90a097b1aa0f
children 01f5580e43d1
line wrap: on
line diff
--- a/libmlk-rpg/mlk/rpg/battle-indicator.c	Mon Feb 27 09:14:27 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-indicator.c	Mon Feb 27 09:46:20 2023 +0100
@@ -43,9 +43,9 @@
 colored(const struct battle_indicator *bti)
 {
 	/* Only check r, g, b and ignore alpha. */
-	return COLOR_R(bti->cur) == COLOR_R(bti->color) &&
-	       COLOR_G(bti->cur) == COLOR_G(bti->color) &&
-	       COLOR_B(bti->cur) == COLOR_B(bti->color);
+	return MLK_COLOR_R(bti->cur) == MLK_COLOR_R(bti->color) &&
+	       MLK_COLOR_G(bti->cur) == MLK_COLOR_G(bti->color) &&
+	       MLK_COLOR_B(bti->cur) == MLK_COLOR_B(bti->color);
 }
 
 void
@@ -93,10 +93,10 @@
 
 		if (!colored(bti)) {
 			/* Update colors first. */
-			bti->cur = COLOR_HEX(
-			    inc(COLOR_R(bti->cur), COLOR_R(bti->color)),
-			    inc(COLOR_G(bti->cur), COLOR_G(bti->color)),
-			    inc(COLOR_B(bti->cur), COLOR_B(bti->color)),
+			bti->cur = MLK_COLOR_HEX(
+			    inc(MLK_COLOR_R(bti->cur), MLK_COLOR_R(bti->color)),
+			    inc(MLK_COLOR_G(bti->cur), MLK_COLOR_G(bti->color)),
+			    inc(MLK_COLOR_B(bti->cur), MLK_COLOR_B(bti->color)),
 			    255
 			);