Skip to content

Commit

Permalink
Fix whitespace and designation bug
Browse files Browse the repository at this point in the history
  • Loading branch information
realSquidCoder committed Feb 1, 2025
1 parent 582654e commit 2f27b5b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions SpriteObjects.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1023,9 +1023,11 @@ void c_sprite::assemble_world_offset(int x, int y, int z, int plateoffset, Tile
}

ALLEGRO_COLOR shade_color = shadeAdventureMode(get_color(b), b->fog_of_war, b->designation.bits.outside);
if (b->occ.bits.dig_auto && containsDesignations(b->designation, b->occ)) { shade_color = al_map_rgba(0, 255, 127, 127); }
if (b->occ.bits.dig_marked && containsDesignations(b->designation, b->occ)) { shade_color = al_map_rgba(0, 127, 255, 127); }
if (b->occ.bits.dig_marked && b->occ.bits.dig_auto && containsDesignations(b->designation, b->occ)) { shade_color = partialBlend(shade_color, al_map_rgba(0, 255, 127, 127), 25); }
if (ssConfig.show_designations) {
if (b->occ.bits.dig_auto && containsDesignations(b->designation, b->occ)) { shade_color = al_map_rgba(0, 255, 127, 127); }
if (b->occ.bits.dig_marked && containsDesignations(b->designation, b->occ)) { shade_color = al_map_rgba(0, 127, 255, 127); }
if (b->occ.bits.dig_marked && b->occ.bits.dig_auto && containsDesignations(b->designation, b->occ)) { shade_color = partialBlend(shade_color, al_map_rgba(0, 255, 127, 127), 25); }
}

if(chop && ( halftile == HALFPLATECHOP)) {
if(shade_color.a > 0.001f) {
Expand Down
2 changes: 1 addition & 1 deletion UserInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ void action_option9(uint32_t keymod) {
break;
case 1: //Dig
sendDFKey(df::interface_key::DESIGNATE_TOGGLE_ADVANCED_OPTIONS);
(stonesenseState.ssState.veinMining) ?
(stonesenseState.ssState.veinMining) ?
sendDFKey(df::interface_key::DESIGNATE_MINE_MODE_ALL):
sendDFKey(df::interface_key::DESIGNATE_MINE_MODE_AUTO);
sendDFKey(df::interface_key::DESIGNATE_TOGGLE_ADVANCED_OPTIONS);
Expand Down

0 comments on commit 2f27b5b

Please sign in to comment.