diff options
| author | Oxore <oxore@protonmail.com> | 2018-12-07 01:29:30 +0300 |
|---|---|---|
| committer | Oxore <oxore@protonmail.com> | 2018-12-07 03:22:30 +0300 |
| commit | 1a75ab85c0555e6f4b3adb1f7a79dc2eb029ac08 (patch) | |
| tree | 5537ec08ae9949d23585603dac9d6e2397970cc0 /src/painter.c | |
| parent | 14f2aadae65713192f1ef722050353c4d781f17e (diff) | |
Fix lines longer than 80 chars, fix codestyle.pl
codestyle.pl: limit to `src` and `include` dirs only.
Diffstat (limited to 'src/painter.c')
| -rw-r--r-- | src/painter.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/painter.c b/src/painter.c index dea9b69..a9029b1 100644 --- a/src/painter.c +++ b/src/painter.c @@ -95,7 +95,8 @@ size_t painter_register_field(struct field *fld) sfRectangleShape_setPosition(f->p[j][i], cell_pos); sfRectangleShape_setFillColor(f->p[j][i], (sfColor)UIBGCOLOR); sfRectangleShape_setSize(f->p[j][i], CELL_SIZE); - sfRectangleShape_setOutlineColor(f->p[j][i], (sfColor)UIFGACTIVECOLOR); + sfRectangleShape_setOutlineColor(f->p[j][i], + (sfColor)UIFGACTIVECOLOR); sfRectangleShape_setOutlineThickness(f->p[j][i], OUT_THICK); } } @@ -118,27 +119,36 @@ void painter_update_field(size_t id, struct field *fld) cell_pos.y = fld->pos.y - (j * (CELL_SIZE.y + 2 * OUT_THICK)); sfRectangleShape_setPosition(f->p[j][i], cell_pos); if (fld->c[j][i].a) { - sfRectangleShape_setFillColor(f->p[j][i], shape_color_map[fld->c[j][i].color]); - sfRectangleShape_setOutlineColor(f->p[j][i], (sfColor)UIFGACTIVECOLOR); + sfRectangleShape_setFillColor(f->p[j][i], + shape_color_map[fld->c[j][i].color]); + sfRectangleShape_setOutlineColor(f->p[j][i], + (sfColor)UIFGACTIVECOLOR); } else if (f->attr & FLD_ATTR_HIDE_EMPTY_CELLS) { - sfRectangleShape_setFillColor(f->p[j][i], (sfColor)UITRANSPARENT); - sfRectangleShape_setOutlineColor(f->p[j][i], (sfColor)UITRANSPARENT); + sfRectangleShape_setFillColor(f->p[j][i], + (sfColor)UITRANSPARENT); + sfRectangleShape_setOutlineColor(f->p[j][i], + (sfColor)UITRANSPARENT); } else { sfRectangleShape_setFillColor(f->p[j][i], (sfColor)UIBGCOLOR); - sfRectangleShape_setOutlineColor(f->p[j][i], (sfColor)UIFGINACTIVECOLOR); + sfRectangleShape_setOutlineColor(f->p[j][i], + (sfColor)UIFGINACTIVECOLOR); } } } + for (size_t s = 0; s < fld->shape_cnt; ++s) { sfColor fill_color = shape_color_map[fld->shape[s].t]; sfColor outline_color = (sfColor)UIFGACTIVECOLOR; + if (fld->shape[s].attr && SHP_ATTR_GHOST) { fill_color.a = 100; outline_color.a = 100; } + for (int j = 0; j < 4; j++) for (int i = 0; i < 4; i++) - if (fld->shape[s].c[j][i] && j + fld->shape[s].y < (int)fld->size.y) { + if (fld->shape[s].c[j][i] && j + fld->shape[s].y + < (int)fld->size.y) { sfRectangleShape_setFillColor( f->p[j + fld->shape[s].y][i + fld->shape[s].x], fill_color); |