From b8d463cc136450c653960e3cd5bdfef64aa0c4b7 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Tue, 25 Mar 2025 19:27:21 -0500 Subject: [PATCH 1/5] Fix the announcements not using the bright bool --- GUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUI.cpp b/GUI.cpp index 66b717d4..31bac874 100644 --- a/GUI.cpp +++ b/GUI.cpp @@ -359,7 +359,7 @@ namespace { auto& ssConfig = stonesenseState.ssConfig; - ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, ssConfig.config.useDfColors); + ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, true, ssConfig.config.useDfColors); draw_text_border(font, color, x, y, flags, DF2UTF(report->text).c_str()); } From a76976a26f2450ff277cee0308cbd4865b07dd7e Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 13 Jul 2025 10:32:13 -0500 Subject: [PATCH 2/5] No implicit cast from bool to int --- GUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUI.cpp b/GUI.cpp index 31bac874..dcf886b6 100644 --- a/GUI.cpp +++ b/GUI.cpp @@ -359,7 +359,7 @@ namespace { auto& ssConfig = stonesenseState.ssConfig; - ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, true, ssConfig.config.useDfColors); + ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, 1, ssConfig.config.useDfColors); draw_text_border(font, color, x, y, flags, DF2UTF(report->text).c_str()); } From 4bd579f61ae61fb4b58dc7260de1eba4b07e486f Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 13 Jul 2025 10:35:32 -0500 Subject: [PATCH 3/5] Revert "No implicit cast from bool to int" This reverts commit a76976a26f2450ff277cee0308cbd4865b07dd7e. --- GUI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUI.cpp b/GUI.cpp index dcf886b6..31bac874 100644 --- a/GUI.cpp +++ b/GUI.cpp @@ -359,7 +359,7 @@ namespace { auto& ssConfig = stonesenseState.ssConfig; - ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, 1, ssConfig.config.useDfColors); + ALLEGRO_COLOR color = ssConfig.config.colors.getDfColor(report->color, true, ssConfig.config.useDfColors); draw_text_border(font, color, x, y, flags, DF2UTF(report->text).c_str()); } From 8f8c8778418713be854d718e96ef6d685410a8d5 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 13 Jul 2025 10:36:05 -0500 Subject: [PATCH 4/5] Add a bool version for bright instead --- commonTypes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/commonTypes.h b/commonTypes.h index 8156d1df..74f3fc6b 100644 --- a/commonTypes.h +++ b/commonTypes.h @@ -187,6 +187,9 @@ class dfColors ALLEGRO_COLOR getDfColor(int color, int bright, bool useDfColors) const { return getDfColor(color + (bright * 8), useDfColors); } + ALLEGRO_COLOR getDfColor(int color, bool bright, bool useDfColors) const { + return getDfColor(color + ((bright?1:0) * 8), useDfColors); + } }; // this is required because gcc 10 can't handle a dependently typed non-type template argu,ent From c6df2f43aa6a8b874b01e5763824deee9921e510 Mon Sep 17 00:00:00 2001 From: Squid Coder Date: Sun, 17 Aug 2025 10:31:46 -0500 Subject: [PATCH 5/5] Update changelog.txt --- docs/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.txt b/docs/changelog.txt index 1c488263..0b8626f9 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -40,6 +40,7 @@ Template for new versions: ## New Features ## Fixes +- `stonesense`: fixed the announcements not using the bright bool (now matches vanilla DF colors) ## Misc Improvements