diff options
Diffstat (limited to 'src/ft_init_lists.c')
| -rw-r--r-- | src/ft_init_lists.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/ft_init_lists.c b/src/ft_init_lists.c index d1b589e..942b9a4 100644 --- a/src/ft_init_lists.c +++ b/src/ft_init_lists.c @@ -33,6 +33,7 @@ t_rgb ** -1: no weapon ** 0: weapon one ** 2: weapon two +** 4: weapon three */ t_player @@ -52,7 +53,11 @@ t_player plist.plane_y = 0.66; plist.has_weapon[0] = 0; plist.has_weapon[1] = 0; + plist.has_weapon[2] = 0; plist.handles_weapon = -1; + plist.ammo[0] = 0; + plist.ammo[1] = 0; + plist.ammo[2] = 0; plist.life = FT_STRT_LIFE; plist.fire = 0; return (plist); @@ -61,6 +66,8 @@ t_player static int8_t ft_init_win(t_win *wl) { + if (!(wl->wlx = malloc(1))) + return (-1); if (!(wl->winptr = malloc(1))) return (-1); wl->inited = 0; @@ -96,8 +103,6 @@ static int8_t cl->walltexgood = 0; ft_init_funptr(cl); ft_init_ref(cl); - if (ft_init_sprites(&cl->sprites) < 0) - return (-1); return (0); } @@ -108,8 +113,22 @@ int8_t return (-1); if (ft_init_win(&clist->wlist) < 0) return (-1); + if (ft_init_sprites(&clist->sprites) < 0) + return (-1); + if (ft_init_weaps(&clist->weaps) < 0) + return (-1); ft_sprintf(clist->fps_count, "fps: 60"); clist->isdead = 0; clist->moves = 0; + clist->life_num_h = 0; + clist->life_num_w = 0; + clist->life_cap_h = 0; + clist->life_cap_w = 0; + clist->map_back_h = 0; + clist->map_back_w = 0; + clist->amm_back_h = 0; + clist->amm_back_w = 0; + clist->ammo_cap_h = 0; + clist->ammo_cap_w = 0; return (0); } |