logistic-bot/cub3d
1
0
Fork 0
mirror of https://codeberg.org/ACME-Corporation/cub3d.git synced 2025-12-06 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: load zombie sprites from map

Browse source
This commit is contained in:
Khaïs COLIN 2025-08-18 13:21:52 +02:00
parent 8445f240a2
commit 5242679d95
Signed by: logistic-bot
SSH key fingerprint: SHA256:RlpiqKeXpcPFZZ4y9Ou4xi2M8OhRJovIwDlbCaMsuAo
7 changed files with 92 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ressources/good_maps/testmap_2.cub
View file

@ -8,7 +8,7 @@ C 225,30,0
1111111111111111111111111 1111111111111111111111111
1000000000110000000000001 1000000000110000000000001
1011000001110000000000001 1011000001110000z00000001
10D1000000000000000000001 10D1000000000000000000001
111111111011000001110M00000000001 111111111011000001110M00000000001
100000000011000001110111110111111 100000000011000001110111110111111

70
ressources/zombie.xpm Normal file
View file

@ -0,0 +1,70 @@
/* XPM */
static char *dummy[]={
"64 64 3 1",
"# c #2c2c2c",
"a c #308ca3",
". c #ff00dc",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......######aa########aaaaaa##aa####aa####aaaaaa##########......",
"......######aa########aaaaaa##aa####aa####aaaaaa##########......",
"......########aa########aa####aaaa##aa######aa############......",
"......########aa########aa####aaaa##aa######aa############......",
"......##########aa######aa####aa##aaaa######aa############......",
"......##########aa######aa####aa##aaaa######aa############......",
"......########aa########aa####aa####aa######aa############......",
"......########aa########aa####aa####aa######aa############......",
"......######aa########aaaaaa##aa####aa######aa############......",
"......######aa########aaaaaa##aa####aa######aa############......",
"......####################################################......",
"......####################################################......",
"......################aaaa######aaaa####aa####aa##########......",
"......################aaaa######aaaa####aa####aa##########......",
"......##############aa####aa##aa##aaaa##aa####aa##########......",
"......##############aa####aa##aa##aaaa##aa####aa##########......",
"......##################aa####aaaa##aa##aaaaaaaa##########......",
"......##################aa####aaaa##aa##aaaaaaaa##########......",
"......################aa######aa####aa##aa####aa##########......",
"......################aa######aa####aa##aa####aa##########......",
"......##############aaaaaaaa####aaaa####aa####aa##########......",
"......##############aaaaaaaa####aaaa####aa####aa##########......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"......####################################################......",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................"};

3
src/consts.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:54:36 by kcolin #+# #+# */ /* Created: 2025/07/17 14:54:36 by kcolin #+# #+# */
/* Updated: 2025/08/14 21:23:25 by tchampio ### ########.fr */ /* Updated: 2025/08/18 13:51:33 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,6 +39,7 @@
# define REV_TEX "ressources/revive.xpm" # define REV_TEX "ressources/revive.xpm"
# define DBLTAP_TEX "ressources/doubletap.xpm" # define DBLTAP_TEX "ressources/doubletap.xpm"
# define MYSTERY_TEX "ressources/box.xpm" # define MYSTERY_TEX "ressources/box.xpm"
# define ZOMBIE_TEX "ressources/zombie.xpm"
# ifdef BONUS # ifdef BONUS
# define COMPILED_TEXT "Compiled with bonuses" # define COMPILED_TEXT "Compiled with bonuses"

4
src/map/forbidden_characters.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:18:13 by kcolin #+# #+# */ /* Created: 2025/07/17 14:18:13 by kcolin #+# #+# */
/* Updated: 2025/08/12 16:18:08 by tchampio ### ########.fr */ /* Updated: 2025/08/18 13:46:15 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,7 +23,7 @@
*/ */
bool has_forbidden_characters(char *line) bool has_forbidden_characters(char *line)
{ {
static const char *allowedchars = " 10NSEWMQJD\n"; static const char *allowedchars = " 10NSEWMQJDz\n";
size_t strsize; size_t strsize;
int i; int i;

21
src/sprites/create_sprite.c
View file

@ -3,10 +3,10 @@
/* ::: :::::::: */ /* ::: :::::::: */
/* create_sprite.c :+: :+: :+: */ /* create_sprite.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: tchampio <tchampio@student.42lehavre.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/08/12 15:43:19 by tchampio #+# #+# */ /* Created: 2025/08/18 13:52:23 by kcolin #+# #+# */
/* Updated: 2025/08/18 12:55:21 by tchampio ### ########.fr */ /* Updated: 2025/08/18 13:55:08 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,7 +16,7 @@
#include "../utils/inits.h" #include "../utils/inits.h"
t_sprite *create_sprite(t_cub3d_data *data, char *texture, t_sprite *create_sprite(t_cub3d_data *data, char *texture,
double x, double y) double x, double y, t_sprite_type type)
{ {
t_sprite *sprite; t_sprite *sprite;
@ -25,7 +25,7 @@ t_sprite *create_sprite(t_cub3d_data *data, char *texture,
return (NULL); return (NULL);
sprite->x = x; sprite->x = x;
sprite->y = y; sprite->y = y;
sprite->sprite_type = OTHER; sprite->sprite_type = type;
sprite->image = load_single_texture(data, texture); sprite->image = load_single_texture(data, texture);
return (sprite); return (sprite);
} }
@ -35,15 +35,18 @@ t_sprite *place_right_sprite(t_cub3d_data *data, char c, double x, double y)
t_sprite *sprite; t_sprite *sprite;
if (c == 'M') if (c == 'M')
sprite = create_sprite(data, MYSTERY_TEX, x + 0.5, y + 0.5); sprite = create_sprite(data, MYSTERY_TEX, x + 0.5, y + 0.5, OTHER);
if (c == 'Q') if (c == 'Q')
sprite = create_sprite(data, sprite = create_sprite(data,
REV_TEX, x + 0.5, y + 0.5); REV_TEX, x + 0.5, y + 0.5, OTHER);
if (c == 'J') if (c == 'J')
sprite = create_sprite(data, sprite = create_sprite(data,
JUGG_TEX, x + 0.5, y + 0.5); JUGG_TEX, x + 0.5, y + 0.5, OTHER);
if (c == 'D') if (c == 'D')
sprite = create_sprite(data, sprite = create_sprite(data,
DBLTAP_TEX, x + 0.5, y + 0.5); DBLTAP_TEX, x + 0.5, y + 0.5, OTHER);
if (c == 'z')
sprite = create_sprite(data,
ZOMBIE_TEX, x + 0.5, y + 0.5, ZOMBIE);
return (sprite); return (sprite);
} }

5
src/sprites/move_sprites.c
View file

@ -6,12 +6,13 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/08/18 13:22:50 by kcolin #+# #+# */ /* Created: 2025/08/18 13:22:50 by kcolin #+# #+# */
/* Updated: 2025/08/18 13:25:07 by kcolin ### ########.fr */ /* Updated: 2025/08/18 13:57:39 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "move_sprites.h" #include "move_sprites.h"
#include "sprite.h" #include "sprite.h"
#include "../../libft/includes/libft.h"
void move_sprites(t_cub3d_data *data) void move_sprites(t_cub3d_data *data)
{ {
@ -21,7 +22,7 @@ void move_sprites(t_cub3d_data *data)
while (i < data->sprite_counter) while (i < data->sprite_counter)
{ {
if (data->sprite_list[i]->sprite_type == ZOMBIE) if (data->sprite_list[i]->sprite_type == ZOMBIE)
data->sprite_list[i]->sprite_pos_x += MOVEMENT_SPEED * data->delta; data->sprite_list[i]->x += MOVEMENT_SPEED * data->delta;
i++; i++;
} }
} }

4
src/utils/inits.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/31 13:43:05 by kcolin #+# #+# */ /* Created: 2025/07/31 13:43:05 by kcolin #+# #+# */
/* Updated: 2025/08/18 13:13:22 by tchampio ### ########.fr */ /* Updated: 2025/08/18 13:52:41 by kcolin ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -65,7 +65,7 @@ void place_base_sprites(t_cub3d_data *data, char **map)
x = 0; x = 0;
while (x < (int)ft_strlen(map[y])) while (x < (int)ft_strlen(map[y]))
{ {
if (ft_strchr("MQJD", map[y][x])) if (ft_strchr("MQJDz", map[y][x]))
{ {
if (data->sprite_counter < MAX_SPRITES) if (data->sprite_counter < MAX_SPRITES)
data->sprite_list[data->sprite_counter++] data->sprite_list[data->sprite_counter++]