From 505bd42bb3bbbac65a6e60dd4e6003c762e89095 Mon Sep 17 00:00:00 2001 From: Quinten Mennen Date: Wed, 4 Jun 2025 19:41:29 +0200 Subject: [PATCH] testing --- Makefile | 4 ++-- inc/cub3d.h | 6 +++++- inc/game_manager.h | 4 ++-- maps/invalid/door_no_sprite.cub | 12 ++++++++++++ src/game/player.c | 3 +-- src/main.c | 16 ++++++++-------- src/manager/game_manager.c | 6 +++--- test.cub | 3 +-- test.sh | 3 +++ 9 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 maps/invalid/door_no_sprite.cub diff --git a/Makefile b/Makefile index 14ff1f5..79a0a2a 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ # By: qmennen +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/15 11:48:46 by whaffman #+# #+# # -# Updated: 2025/06/04 18:16:27 by qmennen ### ########.fr # +# Updated: 2025/06/04 18:59:44 by qmennen ### ########.fr # # # # **************************************************************************** # NAME = cub3D --include flags.mk +FLAGS = "" DIST_PATH = dist SRC_PATH = src diff --git a/inc/cub3d.h b/inc/cub3d.h index 7a21f56..5a9e531 100644 --- a/inc/cub3d.h +++ b/inc/cub3d.h @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */ -/* Updated: 2025/06/03 22:09:53 by qmennen ### ########.fr */ +/* Updated: 2025/06/04 18:54:18 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,6 +24,10 @@ # define FULLSCREEN 1 #endif +#ifndef START_STATE +# define START_STATE GAME_STATE_MENU +#endif + # ifndef M_PI # define M_PI 3.14159265358979323846 # endif diff --git a/inc/game_manager.h b/inc/game_manager.h index b424cd3..66b7801 100644 --- a/inc/game_manager.h +++ b/inc/game_manager.h @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/27 13:40:20 by qmennen #+# #+# */ -/* Updated: 2025/05/27 18:34:07 by qmennen ### ########.fr */ +/* Updated: 2025/06/04 18:52:58 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,7 +15,7 @@ # include "cub3d.h" -t_game_manager *game_manager_create(t_game *game); +t_game_manager *game_manager_create(t_game *game, int state); void game_manager_display(t_game_manager *manager); void game_manager_update(void *param); void game_manager_select(t_game_manager *manager); diff --git a/maps/invalid/door_no_sprite.cub b/maps/invalid/door_no_sprite.cub new file mode 100644 index 0000000..5cdec99 --- /dev/null +++ b/maps/invalid/door_no_sprite.cub @@ -0,0 +1,12 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +F 30,130,130 +C 100,100,200 + +1111111 +10D0001 +1N00001 +1111111 \ No newline at end of file diff --git a/src/game/player.c b/src/game/player.c index 76c3dc3..6531113 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -6,7 +6,7 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/04/15 18:53:19 by qmennen #+# #+# */ -/* Updated: 2025/06/04 18:42:13 by qmennen ### ########.fr */ +/* Updated: 2025/06/04 18:49:17 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,7 +34,6 @@ void interact_door(t_game *game) t_vec2_int pos; pos = vec2_to_int(add(game->player->pos, game->player->dir)); - printf("Tile to flash: (%d, %d), type %d\n", pos.x, pos.y, game->map->grid[pos.y][pos.x]); if (game->map->grid[pos.y][pos.x] == TILE_DOOR) { game->map->grid[pos.y][pos.x] = TILE_EMPTY; diff --git a/src/main.c b/src/main.c index a01b59f..c21bdc3 100644 --- a/src/main.c +++ b/src/main.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* :::::::: */ -/* main.c :+: :+: */ -/* +:+ */ -/* By: qmennen +#+ */ -/* +#+ */ -/* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ -/* Updated: 2025/06/04 17:08:16 by whaffman ######## odam.nl */ +/* ::: :::::::: */ +/* main.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: qmennen +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ +/* Updated: 2025/06/04 18:53:54 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ @@ -27,7 +27,7 @@ int main(int argc, char **argv) game_free(game); return (EXIT_FAILURE); } - manager = game_manager_create(game); + manager = game_manager_create(game, START_STATE); manager->menu = create_main_menu(manager); manager->end_screen = create_end_screen(manager); manager->active_menu = &manager->menu; diff --git a/src/manager/game_manager.c b/src/manager/game_manager.c index 32324c2..f8a946c 100644 --- a/src/manager/game_manager.c +++ b/src/manager/game_manager.c @@ -6,13 +6,13 @@ /* By: qmennen +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/05/27 13:48:18 by qmennen #+# #+# */ -/* Updated: 2025/06/03 20:49:50 by qmennen ### ########.fr */ +/* Updated: 2025/06/04 18:52:53 by qmennen ### ########.fr */ /* */ /* ************************************************************************** */ #include "game_manager.h" -t_game_manager *game_manager_create(t_game *game) +t_game_manager *game_manager_create(t_game *game, int state) { t_game_manager *manager; @@ -21,7 +21,7 @@ t_game_manager *game_manager_create(t_game *game) return (NULL); manager->game = game; manager->menu = NULL; - manager->state = GAME_STATE_MENU; + manager->state = state; game->manager = manager; return (manager); } diff --git a/test.cub b/test.cub index 47a73a1..32d96d2 100644 --- a/test.cub +++ b/test.cub @@ -6,7 +6,6 @@ WE ./assets/bricks2.png SO ./assets/stonewall256.png EA ./assets/bricksx64.png -D ./assets/door.png F 90,30,30 @@ -21,7 +20,7 @@ CT ./assets/ceiling64x64.png -s p ./assets/plant.png -s m ./assets/broken_mirror.png -s t ./assets/test.png --s e ./assets/flying_eye.png +-e e ./assets/flying_eye.png 1111111 111 1111 111111 1111111111 111111 1000001110111001 100001 1000000001 10001 diff --git a/test.sh b/test.sh index b9f2c97..5b8c232 100755 --- a/test.sh +++ b/test.sh @@ -11,6 +11,9 @@ LOG_FILE="test.log" # Overwrite the log file > "$LOG_FILE" +make fclean +make FLAGS+= FLAGS+=" -D START_STATE=GAME_STATE_PLAYING" + # Iterate through all files in the invalid directory for file in "$INVALID_DIR"/*; do test_name=$(basename "$file" | sed -e 's/\..*$//')