Skip to content

Fix the announcements not using the bright bool #229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ab9rf merged 5 commits into from
Aug 17, 2025
Merged

Fix the announcements not using the bright bool #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8d463c
Fix the announcements not using the bright bool
realSquidCoder Mar 26, 2025
a76976a
No implicit cast from bool to int
realSquidCoder Jul 13, 2025
4bd579f
Revert "No implicit cast from bool to int"
realSquidCoder Jul 13, 2025
8f8c877
Add a bool version for bright instead
realSquidCoder Jul 13, 2025
c6df2f4
Update changelog.txt
realSquidCoder Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Comment thread
realSquidCoder marked this conversation as resolved.
draw_text_border(font, color, x, y, flags, DF2UTF(report->text).c_str());
}

Expand Down
3 changes: 3 additions & 0 deletions commonTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down