Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 9 additions & 10 deletions SpriteColors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,24 +206,23 @@ ALLEGRO_COLOR premultiply(ALLEGRO_COLOR input)
ALLEGRO_COLOR shadeAdventureMode(ALLEGRO_COLOR color, bool foggy, bool outside)
{
auto& contentLoader = stonesenseState.contentLoader;
if(contentLoader->gameMode.g_mode != GAMEMODE_ADVENTURE) {

if (!stonesenseState.ssConfig.config.dayNightCycle) {
return color;
}

if(foggy && stonesenseState.ssConfig.config.fog_of_war) {
if(foggy && contentLoader->gameMode.g_mode == GAMEMODE_ADVENTURE) {
color.r *= 0.25f;
color.g *= 0.25f;
color.b *= 0.25f;
}

if(stonesenseState.ssConfig.config.dayNightCycle) {
if(outside) {
color = color*getDayShade(contentLoader->currentHour, contentLoader->currentTickRel);
} else {
color.r *= 0.5f;
color.g *= 0.5f;
color.b *= 0.5f;
}
if (outside) {
color = color * getDayShade(contentLoader->currentHour, contentLoader->currentTickRel);
} else {
color.r *= 0.75f;
color.g *= 0.75f;
color.b *= 0.75f;
}

return color;
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Template for new versions:
# Future

## New Features
- `stonesense`: stonesense now has visible day/night cycle lighting in fortress mode

## Fixes

Expand Down