aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJozanLeClerc <bousset.rudy@gmail.com>2020-03-20 15:07:21 +0100
committerJozanLeClerc <bousset.rudy@gmail.com>2020-03-20 15:07:21 +0100
commit245ddb47ecd8aeae8a7632691a2af1c8dd8cf831 (patch)
treecda387c7b25508a27c8177963778ca912de29629 /src
parentAdded defines for macOS keys (diff)
download42-cub3d-245ddb47ecd8aeae8a7632691a2af1c8dd8cf831.tar.gz
42-cub3d-245ddb47ecd8aeae8a7632691a2af1c8dd8cf831.tar.bz2
42-cub3d-245ddb47ecd8aeae8a7632691a2af1c8dd8cf831.tar.xz
42-cub3d-245ddb47ecd8aeae8a7632691a2af1c8dd8cf831.tar.zst
42-cub3d-245ddb47ecd8aeae8a7632691a2af1c8dd8cf831.zip
Ready to rework
Diffstat (limited to 'src')
-rw-r--r--src/ft_draw_hud.c2
-rw-r--r--src/ft_draw_life_bar.c55
2 files changed, 7 insertions, 50 deletions
diff --git a/src/ft_draw_hud.c b/src/ft_draw_hud.c
index 046fca9..03e6d14 100644
--- a/src/ft_draw_hud.c
+++ b/src/ft_draw_hud.c
@@ -107,7 +107,7 @@ int8_t
ft_draw_minimap_back(clist->mlist.map_h,
clist->mlist.map_w, &clist->wlist, clist);
ft_draw_map(clist->mlist.map, clist);
- ft_draw_life_bar(&clist->wlist, clist);
+ /* ft_draw_life_bar(&clist->wlist, clist); */
if (clist->mlist.isnlvl)
{
ft_draw_stage_back(clist);
diff --git a/src/ft_draw_life_bar.c b/src/ft_draw_life_bar.c
index 17c6dc4..11fdaf5 100644
--- a/src/ft_draw_life_bar.c
+++ b/src/ft_draw_life_bar.c
@@ -16,58 +16,15 @@
static void
ft_draw_green_life(uint16_t h, t_win *wl, t_cub *cl)
{
- const uint16_t scl = cl->mlist.scale;
- uint32_t x;
- uint32_t y;
- int32_t col;
-
- col = 0x0035ae35;
- x = (cl->mlist.map_w * scl) + 20 + 9;
- while (x < (cl->mlist.map_w * scl) + 20 + ((3 * scl) - 9))
- {
- y = (wl->y_size - (cl->mlist.map_h * scl) - 20 + 9)
- + ((100 - cl->plist.life) * (h / (cl->mlist.map_h * scl) - 1));
- while (y < wl->y_size - 9)
- {
- *(int*)(cl->img.ptr + (x * 4 + (y * cl->img.sizeline))) = col;
- if (!(y % 3))
- {
- if (col < 0x00aaaaaa)
- col += 0x00010101;
- }
- y++;
- }
- col = 0x0035ae35;
- x++;
- }
+ (void)h;
+ (void)wl;
+ (void)cl;
}
void
ft_draw_life_bar(t_win *wl, t_cub *cl)
{
- const uint16_t scl = cl->mlist.scale;
- uint32_t x;
- uint32_t y;
- int32_t col;
-
- col = 0x00ae3535;
- x = (cl->mlist.map_w * scl) + 20 + 9;
- y = wl->y_size - (cl->mlist.map_h * scl) - 20 + 9;
- while (x < (cl->mlist.map_w * scl) + 20 + ((3 * scl) - 9))
- {
- while (y < wl->y_size - 9)
- {
- *(int*)(cl->img.ptr + (x * 4 + (y * cl->img.sizeline))) = col;
- if (!(y % 3))
- {
- if (col < 0x00aaaaaa)
- col += 0x00010101;
- }
- y++;
- }
- col = 0x00ae3535;
- y = wl->y_size - (cl->mlist.map_h * scl) - 20 + 9;
- x++;
- }
- ft_draw_green_life(y, wl, cl);
+ (void)wl;
+ (void)cl;
+ ft_draw_green_life(1, wl, cl);
}