diff options
| -rw-r--r-- | map/map_one.cub | 18 | ||||
| -rw-r--r-- | src/ft_raycasting.c | 2 |
2 files changed, 4 insertions, 16 deletions
diff --git a/map/map_one.cub b/map/map_one.cub index cc4b774..d135e42 100644 --- a/map/map_one.cub +++ b/map/map_one.cub @@ -1,30 +1,18 @@ R 1400 900 -<<<<<<< HEAD NO ./media/img/BRIQUASSES.xpm SO ./media/img/BRIQUASSE_3.xpm EA ./media/img/BRIQUASSES_2.xpm WE ./media/img/MURLOL.xpm -S ./media/img/MURLOL.xpm -======= -NO ./map/img/BRIQUASSES.xpm -SO ./map/img/BRIQUASSE_3.xpm -EA ./map/img/BRIQUASSES_2.xpm -WE ./map/img/MURLOL.xpm -S ./map/img/pillar.xpm ->>>>>>> sprites +S ./media/img/pillar.xpm C 50,100,200 F 50,190,124 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 -1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -<<<<<<< HEAD -1 S 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 -======= -1 E 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 ->>>>>>> sprites +1 0 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 1 +1 N 1 1 0 0 0 0 0 1 1 1 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 0 1 1 1 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 1 diff --git a/src/ft_raycasting.c b/src/ft_raycasting.c index 9c0bbdc..7bfe82e 100644 --- a/src/ft_raycasting.c +++ b/src/ft_raycasting.c @@ -110,8 +110,8 @@ void ft_choose_tex(cl); ft_calc_tex(cl); ft_calc_sprite(cl); + /* ft_draw_sprite(cl , i); */ ft_draw_verline(cl, i, cl->rlist.wall_t, cl->rlist.wall_b); - ft_draw_sprite(cl , i); i++; } } |