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

fix: Changed return type of set_color() and converted types for colors

Browse source
This commit is contained in:
Theo Champion 2025-07-22 12:12:36 +02:00
parent 4b2f671107
commit d7ca150c74
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/map/mapdata.h
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/07/17 14:58:19 by kcolin #+# #+# */ /* Created: 2025/07/17 14:58:19 by kcolin #+# #+# */
/* Updated: 2025/07/17 15:57:59 by kcolin ### ########.fr */ /* Updated: 2025/07/22 12:20:12 by tchampio ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -25,22 +25,22 @@ typedef enum e_direction
typedef struct s_mapdata typedef struct s_mapdata
{ {
char *filename; char *filename;
char *no_texture; char *no_texture;
char *so_texture; char *so_texture;
char *we_texture; char *we_texture;
char *ea_texture; char *ea_texture;
int f_color; unsigned int f_color;
int c_color; unsigned int c_color;
int mapheight; int mapheight;
char **map; char **map;
char **mapflood; char **mapflood;
int skipped_lines; int skipped_lines;
bool isvalid; bool isvalid;
int startx; int startx;
int starty; int starty;
t_direction startdirection; t_direction startdirection;
char error[1024]; char error[1024];
} t_mapdata; } t_mapdata;
#endif // MAPDATA_H #endif // MAPDATA_H

6
src/map/setters.c
View file

@ -6,7 +6,7 @@
/* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */ /* By: kcolin <kcolin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/06/21 19:35:43 by tchampio #+# #+# */ /* Created: 2025/06/21 19:35:43 by tchampio #+# #+# */
/* Updated: 2025/07/22 12:11:28 by tchampio ### ########.fr */ /* Updated: 2025/07/22 12:20:29 by tchampio ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,11 +39,11 @@ bool perform_color_checks(int *color, char *strcolor, t_mapdata *map)
return (true); return (true);
} }
unsigned long set_color(const char *s, t_mapdata *map) unsigned int set_color(const char *s, t_mapdata *map)
{ {
int i; int i;
bool isok; bool isok;
unsigned long finalcolor; unsigned int finalcolor;
char **tab; char **tab;
int rgb[100]; int rgb[100];