projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb8d97e
)
code cleanup
author
Holger Schemel
<info@artsoft.org>
Sat, 12 May 2018 09:20:12 +0000
(11:20 +0200)
committer
Holger Schemel
<info@artsoft.org>
Tue, 5 Jun 2018 18:58:42 +0000
(20:58 +0200)
src/libgame/sdl.c
patch
|
blob
|
history
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index df5b32425fe870d6c0d9547b19bafdc5b5e1bdcd..46d9abac9ea7aef6cb5d048c3f3f94ce86a1812f 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-3052,44
+3052,45
@@
static void DrawTouchInputOverlay_ShowGridButtons(int alpha)
{
for (y = 0; y < grid_ysize; y++)
{
{
for (y = 0; y < grid_ysize; y++)
{
+ int grid_button = overlay.grid_button[x][y];
+ int alpha_draw = alpha;
+
+ if (grid_button == CHAR_GRID_BUTTON_NONE)
+ continue;
+
+ if (grid_button == overlay.grid_button_highlight)
+ alpha_draw = alpha_highlight;
+
+ SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha_draw);
+
rect.x = (x + 0) * video.screen_width / grid_xsize;
rect.y = (y + 0) * video.screen_height / grid_ysize;
rect.w = (x + 1) * video.screen_width / grid_xsize - rect.x;
rect.h = (y + 1) * video.screen_height / grid_ysize - rect.y;
rect.x = (x + 0) * video.screen_width / grid_xsize;
rect.y = (y + 0) * video.screen_height / grid_ysize;
rect.w = (x + 1) * video.screen_width / grid_xsize - rect.x;
rect.h = (y + 1) * video.screen_height / grid_ysize - rect.y;
- if (x == 0 ||
- overlay.grid_button[x - 1][y] != overlay.grid_button[x][y])
+ if (x == 0 || overlay.grid_button[x - 1][y] != grid_button)
{
rect.x += 2;
rect.w -= 2;
}
{
rect.x += 2;
rect.w -= 2;
}
- if (x == grid_xsize - 1 ||
- overlay.grid_button[x + 1][y] != overlay.grid_button[x][y])
+ if (x == grid_xsize - 1 || overlay.grid_button[x + 1][y] != grid_button)
{
rect.w -= 2;
}
{
rect.w -= 2;
}
- if (y == 0 ||
- overlay.grid_button[x][y - 1] != overlay.grid_button[x][y])
+ if (y == 0 || overlay.grid_button[x][y - 1] != grid_button)
{
rect.y += 2;
rect.h -= 2;
}
{
rect.y += 2;
rect.h -= 2;
}
- if (y == grid_ysize - 1 ||
- overlay.grid_button[x][y + 1] != overlay.grid_button[x][y])
+ if (y == grid_ysize - 1 || overlay.grid_button[x][y + 1] != grid_button)
{
rect.h -= 2;
}
{
rect.h -= 2;
}
- if (overlay.grid_button[x][y] == overlay.grid_button_highlight)
- SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha_highlight);
- else
- SDL_SetRenderDrawColor(sdl_renderer, 255, 255, 255, alpha);
-
- if (overlay.grid_button[x][y] != CHAR_GRID_BUTTON_NONE)
- SDL_RenderFillRect(sdl_renderer, &rect);
+ SDL_RenderFillRect(sdl_renderer, &rect);
}
}
}
}