From fd95706ffa8184198cd8af8575a9611d0a7efb8f Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Thu, 10 Jun 2021 01:00:59 +0200 Subject: [PATCH] corrected last segfaults, added 150ms before SDL_WaitEvent calls for debounce --- .depend | 480 +++++++++++++++++++++++----------- data/levels_1p_FunKey.lvl | 202 +++++++------- data/levels_editor_FunKey.lvl | 51 ++-- include/misc.h | 1 + include/niveau.h | 2 - src/editeur.c | 35 ++- src/main.c | 77 +++--- src/map.c | 9 +- src/niveau.c | 34 ++- 9 files changed, 548 insertions(+), 343 deletions(-) diff --git a/.depend b/.depend index 13c7d38..7daea29 100644 --- a/.depend +++ b/.depend @@ -1,17 +1,32 @@ -player.o: src/player.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +player.o: src/player.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/game.h src/../include/../include/constant.h \ src/../include/../include/misc.h src/../include/../include/map.h \ src/../include/../include/player.h \ @@ -19,34 +34,62 @@ player.o: src/player.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ src/../include/../include/bomb.h src/../include/../include/monsters.h \ src/../include/../include/flamme.h game_time.o: src/game_time.c src/../include/game_time.h \ - /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ src/../include/constant.h -flamme.o: src/flamme.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +flamme.o: src/flamme.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/game.h src/../include/../include/constant.h \ src/../include/../include/misc.h src/../include/../include/map.h \ src/../include/../include/player.h \ @@ -55,71 +98,130 @@ flamme.o: src/flamme.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ src/../include/../include/flamme.h game.o: src/game.c src/../include/game.h \ src/../include/../include/constant.h src/../include/../include/misc.h \ - /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/../include/map.h src/../include/../include/player.h \ src/../include/../include/../include/constant.h \ src/../include/../include/bomb.h src/../include/../include/monsters.h \ src/../include/../include/flamme.h src/../include/game_time.h \ src/../include/misc.h src/../include/player.h src/../include/bomb.h \ src/../include/monsters.h src/../include/flamme.h -niveau.o: src/niveau.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +niveau.o: src/niveau.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/editeur.h src/../include/misc.h src/../include/constant.h \ src/../include/niveau.h -misc.o: src/misc.c src/../include/misc.h /usr/include/SDL/SDL.h \ - /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_stdinc.h \ - /usr/include/SDL/SDL_config.h /usr/include/SDL/SDL_platform.h \ - /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \ - /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_error.h \ - /usr/include/SDL/SDL_endian.h /usr/include/SDL/SDL_mutex.h \ - /usr/include/SDL/SDL_thread.h /usr/include/SDL/SDL_rwops.h \ - /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_cpuinfo.h \ - /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \ - /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \ - /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \ - /usr/include/SDL/SDL_joystick.h /usr/include/SDL/SDL_quit.h \ - /usr/include/SDL/SDL_loadso.h /usr/include/SDL/SDL_timer.h \ - /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_image.h \ - /usr/include/SDL/SDL.h src/../include/constant.h -main.o: src/main.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +misc.o: src/misc.c src/../include/misc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + src/../include/constant.h +main.o: src/main.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/constant.h src/../include/game.h \ src/../include/../include/constant.h src/../include/../include/misc.h \ src/../include/../include/map.h src/../include/../include/player.h \ @@ -127,56 +229,101 @@ main.o: src/main.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ src/../include/../include/bomb.h src/../include/../include/monsters.h \ src/../include/../include/flamme.h src/../include/game_time.h \ src/../include/editeur.h src/../include/niveau.h -editeur.o: src/editeur.c /usr/include/SDL/SDL.h \ - /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_stdinc.h \ - /usr/include/SDL/SDL_config.h /usr/include/SDL/SDL_platform.h \ - /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \ - /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_error.h \ - /usr/include/SDL/SDL_endian.h /usr/include/SDL/SDL_mutex.h \ - /usr/include/SDL/SDL_thread.h /usr/include/SDL/SDL_rwops.h \ - /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_cpuinfo.h \ - /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \ - /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \ - /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \ - /usr/include/SDL/SDL_joystick.h /usr/include/SDL/SDL_quit.h \ - /usr/include/SDL/SDL_loadso.h /usr/include/SDL/SDL_timer.h \ - /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_image.h \ - /usr/include/SDL/SDL.h src/../include/constant.h \ - src/../include/editeur.h src/../include/map.h src/../include/misc.h -monsters.o: src/monsters.c /usr/include/SDL/SDL.h \ - /usr/include/SDL/SDL_main.h /usr/include/SDL/SDL_stdinc.h \ - /usr/include/SDL/SDL_config.h /usr/include/SDL/SDL_platform.h \ - /usr/include/SDL/begin_code.h /usr/include/SDL/close_code.h \ - /usr/include/SDL/SDL_audio.h /usr/include/SDL/SDL_error.h \ - /usr/include/SDL/SDL_endian.h /usr/include/SDL/SDL_mutex.h \ - /usr/include/SDL/SDL_thread.h /usr/include/SDL/SDL_rwops.h \ - /usr/include/SDL/SDL_cdrom.h /usr/include/SDL/SDL_cpuinfo.h \ - /usr/include/SDL/SDL_events.h /usr/include/SDL/SDL_active.h \ - /usr/include/SDL/SDL_keyboard.h /usr/include/SDL/SDL_keysym.h \ - /usr/include/SDL/SDL_mouse.h /usr/include/SDL/SDL_video.h \ - /usr/include/SDL/SDL_joystick.h /usr/include/SDL/SDL_quit.h \ - /usr/include/SDL/SDL_loadso.h /usr/include/SDL/SDL_timer.h \ - /usr/include/SDL/SDL_version.h /usr/include/SDL/SDL_image.h \ - /usr/include/SDL/SDL.h src/../include/game.h \ - src/../include/../include/constant.h src/../include/../include/misc.h \ - src/../include/../include/map.h src/../include/../include/player.h \ +editeur.o: src/editeur.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + src/../include/constant.h src/../include/editeur.h src/../include/map.h \ + src/../include/misc.h +monsters.o: src/monsters.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + src/../include/game.h src/../include/../include/constant.h \ + src/../include/../include/misc.h src/../include/../include/map.h \ + src/../include/../include/player.h \ src/../include/../include/../include/constant.h \ src/../include/../include/bomb.h src/../include/../include/monsters.h \ src/../include/../include/flamme.h -map.o: src/map.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +map.o: src/map.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/constant.h src/../include/map.h src/../include/misc.h \ src/../include/game_time.h src/../include/game.h \ src/../include/../include/constant.h src/../include/../include/misc.h \ @@ -184,20 +331,35 @@ map.o: src/map.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ src/../include/../include/../include/constant.h \ src/../include/../include/bomb.h src/../include/../include/monsters.h \ src/../include/../include/flamme.h -bomb.o: src/bomb.c /usr/include/SDL/SDL.h /usr/include/SDL/SDL_main.h \ - /usr/include/SDL/SDL_stdinc.h /usr/include/SDL/SDL_config.h \ - /usr/include/SDL/SDL_platform.h /usr/include/SDL/begin_code.h \ - /usr/include/SDL/close_code.h /usr/include/SDL/SDL_audio.h \ - /usr/include/SDL/SDL_error.h /usr/include/SDL/SDL_endian.h \ - /usr/include/SDL/SDL_mutex.h /usr/include/SDL/SDL_thread.h \ - /usr/include/SDL/SDL_rwops.h /usr/include/SDL/SDL_cdrom.h \ - /usr/include/SDL/SDL_cpuinfo.h /usr/include/SDL/SDL_events.h \ - /usr/include/SDL/SDL_active.h /usr/include/SDL/SDL_keyboard.h \ - /usr/include/SDL/SDL_keysym.h /usr/include/SDL/SDL_mouse.h \ - /usr/include/SDL/SDL_video.h /usr/include/SDL/SDL_joystick.h \ - /usr/include/SDL/SDL_quit.h /usr/include/SDL/SDL_loadso.h \ - /usr/include/SDL/SDL_timer.h /usr/include/SDL/SDL_version.h \ - /usr/include/SDL/SDL_image.h /usr/include/SDL/SDL.h \ +bomb.o: src/bomb.c \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_main.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_stdinc.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_config.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_platform.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/begin_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/close_code.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_audio.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_error.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_endian.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mutex.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_thread.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_rwops.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cdrom.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_cpuinfo.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_events.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_active.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keyboard.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_keysym.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_mouse.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_video.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_joystick.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_quit.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_loadso.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_timer.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_version.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL_image.h \ + /opt/FunKey-sdk-2.0.0/arm-funkey-linux-musleabihf/sysroot/usr/bin/../../usr/include/SDL/SDL.h \ src/../include/game.h src/../include/../include/constant.h \ src/../include/../include/misc.h src/../include/../include/map.h \ src/../include/../include/player.h \ diff --git a/data/levels_1p_FunKey.lvl b/data/levels_1p_FunKey.lvl index ead5de8..675034d 100644 --- a/data/levels_1p_FunKey.lvl +++ b/data/levels_1p_FunKey.lvl @@ -1,16 +1,16 @@ -12:15 -666686676696666 -400000000000000 -012121212121210 -020202020202020 -012121212121210 -020202020202020 -012121232121210 -020202020202020 -012121212121210 -020202020202020 -012121212121210 -000000000000000 +12:11 +66866766966 +40000000000 +00212121200 +02020202020 +01212121210 +02020202020 +01212321210 +02020202020 +01212121210 +02020202020 +00212121200 +00000000000 - 10:11 k4000000000 @@ -24,103 +24,97 @@ k4000000000 60212121212 k0020202023 - -13:15 -666667686966666 -640022222222556 -612121212121216 -622000000000226 -610121212121016 -620220222022226 -610121252121016 -622220222022026 -610121212121016 -622000002000226 -612121212121216 -655222222222236 -666666666666666 +11:11 +66676869666 +40022222225 +22212121202 +20200200201 +11212121211 +12000200021 +11212521211 +52000200021 +11012121211 +20502020052 +21212121223 - -14:13 -6668667669666 -6500000002206 -6000000100006 -6000401102206 -6211102002006 -6120022211006 -6220222200116 -6001222112006 -6221221102206 -6001120022216 -6101201100226 -6102001022126 -6002001100136 -6666666666666 +11:11 +66866766966 +50000000220 +00040110220 +21110200200 +12002221100 +22022220011 +00122211200 +02112002221 +10120110022 +10200102212 +00200110013 - -9:20 -60000100010001000103 -60022222222222222200 -70020202020202020200 -60022121212121212200 -84020202020202020200 -60022121212121212200 -90020202020202020200 -60022222222222222200 -60010001000100010003 +9:10 +6000100013 +6022222220 +7020202020 +6022121210 +8420202020 +6022121210 +9020202020 +6022222220 +6010001003 - -13:15 -102020261101224 -201021061200220 -212212062201222 -221221050001110 -120122172200022 -010022261120211 -666566686665666 -321200262122121 -222101092101020 -221221052121212 -222122160102010 -221210262211112 -202020260202020 +13:13 +1202026111224 +2102106120220 +2221206220122 +2122100001110 +1012217220022 +0002226110211 +6656668660666 +3120026022201 +2210109221020 +2122105211212 +0222016012025 +2121026222212 +2202026022525 - -13:15 -666676686696666 -600222222222036 -601212121112106 -622002221110226 -621110121110126 -621112000222226 -621112121211126 -620222000211126 -621011121211126 -622011122200226 -601211101012106 -640222202222006 -666666666666666 +12:11 +66676869666 +00222222203 +01212211210 +22002211022 +21110211012 +21112022222 +21112221112 +20222021112 +21011201112 +22011220022 +01211001210 +40222022200 - -13:17 -66666766866966666 -01121121121121100 -04101202201202200 -01121121121121100 -01121121121121122 -02202202102202123 -01121121121121122 -01121121121121100 -02201202201202200 -01121121121121100 -01121121121121122 -02102202102202132 -01121121121121122 +13:13 +6667668669666 +0211211211210 +0012022012020 +0211211211210 +0211211211212 +0022021022013 +4211211211212 +0211211211210 +0012022012020 +0211211211210 +0211211211212 +0022021022013 +0211211211212 - -9:20 -62202120202100022005 -62122212212212212200 -70212221221221221220 -63111020202120202122 -81111111111111111102 -64010222010220010022 -62012010212012210221 -90210212010212212211 -62022010222012222011 +9:12 +652022212105 +621202202220 +702222112221 +631102215102 +811111111102 +640021020222 +621201200201 +901021022201 +622202202011 - 15:19 0000066668666600000 diff --git a/data/levels_editor_FunKey.lvl b/data/levels_editor_FunKey.lvl index 536d932..7d053f7 100644 --- a/data/levels_editor_FunKey.lvl +++ b/data/levels_editor_FunKey.lvl @@ -1,27 +1,30 @@ -12:12 -222320022222 -200000000222 -000000000022 -000000000222 -220004000222 -200000000022 -200000000022 -200000000222 -220002200022 -202020222222 -202020222222 -202020222222 -- -9:20 -60000100010001000103 -60022222222222222200 -70020202020202020200 -60022121212121212200 -84020202020202020200 -60022121212121212200 -90020202020202020200 -60022222222222222200 -60010001000100010003 +15:19 +0000066668666600000 +0007662204022669000 +0066222222222226600 +0662222222222222660 +6622222222222222266 +6222266666666622226 +6222600000000062226 +6226006600066006226 +6226006600066006226 +6226006600066006226 +6226006600066006226 +6622600000000062266 +0662266666666622660 +0066222223222226600 +0006666666666666000 +- +9:10 +6000100013 +6022222220 +7020202020 +6022121210 +8420202020 +6022121210 +9020202020 +6022222220 +6010001003 - 13:13 0111111111110 diff --git a/include/misc.h b/include/misc.h index 25a46e2..397c78e 100644 --- a/include/misc.h +++ b/include/misc.h @@ -25,6 +25,7 @@ #ifdef HW_SCREEN_RESIZE extern SDL_Surface *hw_screen; #endif //HW_SCREEN_RESIZE +extern SDL_Surface *screen; #ifdef SOUND_SDL_ACTIVATED extern bool audio_init_ok; diff --git a/include/niveau.h b/include/niveau.h index 3d2549a..6b63990 100644 --- a/include/niveau.h +++ b/include/niveau.h @@ -1,8 +1,6 @@ #ifndef NIVEAU_H_ #define NIVEAU_H_ - - extern int niveau_1_joueur(SDL_Surface *screen, int niveau); extern int niveau_2_joueur(SDL_Surface *screen, int choix_niveau); extern int editeur_choix_niveau(SDL_Surface *screen); diff --git a/src/editeur.c b/src/editeur.c index a73bbc8..4fcd846 100644 --- a/src/editeur.c +++ b/src/editeur.c @@ -21,11 +21,18 @@ void editeur(SDL_Surface *screen, int niveau) int continuer = 1, clicGaucheEnCours = 0, clicDroitEnCours = 0; int objetActuel = CELL_WALL; int i, j, xp1, yp1, player1_ok=1, xp2, yp2, player2_ok=1; - FILE *level=fopen("data/niveaux.lvl","r"); + + FILE *level; + const char *file_path = SRC_LEVELS_EDITOR; + level=fopen(file_path,"r"); + if(level==NULL){ + printf("ERROR: cannot open file: %s\n", file_path); + } + t_map map = map_load_dynamic(level,niveau,2); - #ifdef HW_SCREEN_RESIZE + uint16_t scaled_height, scaled_height_offset; //if(screen != NULL) SDL_FreeSurface(screen); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, SIZE_BLOC * map_get_width(map), SIZE_BLOC * map_get_height(map), WINDOW_BPP, 0, 0, 0, 0); @@ -65,6 +72,18 @@ void editeur(SDL_Surface *screen, int niveau) continuer = 0; break; case SDL_MOUSEBUTTONDOWN: + +#ifdef HW_SCREEN_RESIZE + //printf("\nBefore: (%d, %d)\n", event.button.x, event.button.y); + event.button.x = event.button.x*(SIZE_BLOC*map_get_width(map))/HW_SCREEN_WIDTH; + scaled_height = MIN(SIZE_BLOC*map_get_height(map)*HW_SCREEN_WIDTH/(SIZE_BLOC*map_get_width(map)), HW_SCREEN_HEIGHT); + scaled_height_offset = (HW_SCREEN_HEIGHT-scaled_height); + event.button.y = MAX(event.button.y*(SIZE_BLOC*map_get_height(map))/scaled_height, scaled_height_offset)-scaled_height_offset; + event.motion.x = event.button.x; + event.motion.y = event.button.y; + //printf("After: (%d, %d)\n", event.button.x, event.button.y); +#endif // HW_SCREEN_RESIZE + if (event.button.button == SDL_BUTTON_LEFT) { // On met l'objet actuellement choisi (wall, box...) à l'endroit du clic @@ -103,6 +122,17 @@ void editeur(SDL_Surface *screen, int niveau) break; case SDL_MOUSEMOTION: +#ifdef HW_SCREEN_RESIZE + //printf("\nBefore: (%d, %d)\n", event.button.x, event.button.y); + event.button.x = event.button.x*(SIZE_BLOC*map_get_width(map))/HW_SCREEN_WIDTH; + scaled_height = MIN(SIZE_BLOC*map_get_height(map)*HW_SCREEN_WIDTH/(SIZE_BLOC*map_get_width(map)), HW_SCREEN_HEIGHT); + scaled_height_offset = (HW_SCREEN_HEIGHT-scaled_height); + event.button.y = MAX(event.button.y*(SIZE_BLOC*map_get_height(map))/scaled_height, scaled_height_offset)-scaled_height_offset; + event.motion.x = event.button.x; + event.motion.y = event.button.y; + //printf("After: (%d, %d)\n", event.button.x, event.button.y); +#endif // HW_SCREEN_RESIZE + if (clicGaucheEnCours) // Si on déplace la souris et que le bouton gauche de la souris est enfoncé { if (objetActuel==CELL_PLAYER){ @@ -208,7 +238,6 @@ void editeur(SDL_Surface *screen, int niveau) - player1_ok=1; player2_ok=1; // Placement des objets à l'écran diff --git a/src/main.c b/src/main.c index d52807b..833718e 100644 --- a/src/main.c +++ b/src/main.c @@ -195,7 +195,7 @@ int input_update(t_game game, int nb_joueur) { //Fonction principale une fois qu'une partie est lancee, gere l'actualisation du jeu. //Cette fonction retourne un entier qui est le niveau à jouer ensuite (sert pour le mode 1 joueur) -int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill_bomb, int game_over) { +int main_game(int nb_joueur, int niveau, int mode, int kill_bomb, int game_over) { //nb_joueur indique le nombre de joueurs //niveau indique le niveau à charger //mode indique si on est en mode jeu principal (dans ce cas mode=1) ou en mode "jouer aux niveaux édités" (mode=2) @@ -326,17 +326,8 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill } } -#ifdef HW_SCREEN_RESIZE - SDL_FillRect(hw_screen, NULL, 0x000000); - if(screen != NULL) SDL_FreeSurface(screen); - screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); -#else //HW_SCREEN_RESIZE - screen = SDL_SetVideoMode(480,480, WINDOW_BPP,SDL_HWSURFACE); - if (screen == NULL) { - error("Can't set video mode: %s\n", SDL_GetError()); - exit(1); - } -#endif //HW_SCREEN_RESIZE + /** Free game assets */ + game_free(game); int boucle=0; //cette variable autorise ou non l'affichage de messages comme "vous avez gagné", "game over", ... @@ -385,26 +376,39 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill } } - SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); - if(menu != NULL){ - SDL_BlitSurface(menu, NULL, screen, &positionMenu); - SDL_FreeSurface(menu); - } - + bool continu = false; + if (boucle==1 && menu != NULL){ + + /** Display Menu */ #ifdef HW_SCREEN_RESIZE - flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, - HW_SCREEN_WIDTH, - MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); - SDL_Flip(hw_screen); + SDL_FillRect(hw_screen, NULL, 0x000000); + if(screen != NULL) SDL_FreeSurface(screen); + screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 480,480, WINDOW_BPP, 0, 0, 0, 0); #else //HW_SCREEN_RESIZE - SDL_Flip(screen); + screen = SDL_SetVideoMode(480,480, WINDOW_BPP,SDL_HWSURFACE); + if (screen == NULL) { + error("Can't set video mode: %s\n", SDL_GetError()); + exit(1); + } #endif //HW_SCREEN_RESIZE + SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); + SDL_BlitSurface(menu, NULL, screen, &positionMenu); + SDL_FreeSurface(menu); - bool continu = false; - if (boucle==1){ +#ifdef HW_SCREEN_RESIZE + flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, + HW_SCREEN_WIDTH, + MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); + SDL_Flip(hw_screen); +#else //HW_SCREEN_RESIZE + SDL_Flip(screen); +#endif //HW_SCREEN_RESIZE + + /** Wait for key press */ while (!continu) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { @@ -428,12 +432,10 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill } if (nb_joueur==1 && player_win(player1)==1){ - game_free(game); return niveau; //permet de passer au niveau suivant } else if(game_over==0){ game_over=NB_DECES; - game_free(game); return 0; // s'il y a game over la valeur retournée est 0 afin de reprendre le jeu depuis le niveau 1 } else if(done==2){ @@ -442,7 +444,6 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill // (donc le nombre de décès autorisés avant d'avoir un game over) } else { - game_free(game); return niveau-1; // lorsque le joueur meurt, informe qu'il faut //rejouer le niveau précédent et décrémenter la variable game_over } @@ -459,7 +460,9 @@ int main(int argc, char *argv[]) { error("Can't init SDL: %s\n", SDL_GetError()); } SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); +#ifdef FUNKEY SDL_ShowCursor(SDL_DISABLE); +#endif //FUNKEY /** Init Video */ #ifdef HW_SCREEN_RESIZE @@ -713,15 +716,15 @@ int main(int argc, char *argv[]) { choix_entrer_dans_niveau = niveau_1_joueur(screen,niveau_reussi+1); if (choix_entrer_dans_niveau==0){ ancien_niveau=niveau_reussi; - niveau_reussi=main_game(screen,1,niveau_reussi+1,1, kill_bomb, game_over); // le jeu se lance, + niveau_reussi=main_game(1,niveau_reussi+1,1, kill_bomb, game_over); // le jeu se lance, //le résultat retourné est stocké dans la variable niveau_reussi. if(ancien_niveau==niveau_reussi && ancien_niveau!=0){ game_over--; //on regarde si le joueur est mort, dans ce cas on décrémente game_over. } - - else if(niveau_reussi==-1) //si l'utilisateur a fait échap ou quitter durant la partie. - niveau_reussi=ancien_niveau; + else if(niveau_reussi==-1){ //si l'utilisateur a fait échap ou quitter durant la partie. + niveau_reussi=ancien_niveau; + } if (niveau_reussi>=10){ //si l'utilisateur à gagné le mode 1 joueur choix_entrer_dans_niveau=niveau_1_joueur(screen,0); @@ -731,6 +734,7 @@ int main(int argc, char *argv[]) { // play_music=1; break; } + } else{ if(are_you_sure(screen)==1){ //si l'utilisateur veut quitter le mode 1 joueur @@ -774,7 +778,7 @@ int main(int argc, char *argv[]) { if(choix_entrer_niveau_2p==0) sure=are_you_sure(screen); else - main_game(screen,2,choix_entrer_niveau_2p,1, kill_bomb, game_over); + main_game(2,choix_entrer_niveau_2p,1, kill_bomb, game_over); } @@ -813,9 +817,9 @@ int main(int argc, char *argv[]) { choix_niveau=niveau_2_joueur(screen,choix_ancien_niveau); if(choix_niveau==0) - sure=are_you_sure(screen); + sure=are_you_sure(screen); else if (niveau_1_joueur(screen,-1)==0) - editeur(screen,choix_niveau); + editeur(screen,choix_niveau); } @@ -862,7 +866,7 @@ int main(int argc, char *argv[]) { nb_joueurs=choix_nb_joueurs(screen); if(nb_joueurs!=0 ){ - main_game(screen,nb_joueurs,choix_niveau,2, kill_bomb, game_over); + main_game(nb_joueurs,choix_niveau,2, kill_bomb, game_over); } } @@ -955,7 +959,6 @@ int main(int argc, char *argv[]) { default: break; } - /** Reset main menu screen */ if (resize==1){ diff --git a/src/map.c b/src/map.c index f48fab3..9cd1ded 100644 --- a/src/map.c +++ b/src/map.c @@ -269,7 +269,14 @@ void sauvegarderNiveau(t_map map, int niveau){ FILE* fichier = NULL; int i = 0, j=0, continuer=1,k=1; char a; - fichier = fopen("data/niveaux.lvl", "r+"); + + const char *file_path = SRC_LEVELS_EDITOR; + fichier=fopen(file_path,"r+"); + if(fichier==NULL){ + printf("ERROR: cannot open file: %s\n", file_path); + } + //fichier = fopen("data/niveaux.lvl", "r+"); + while (continuer==1){ if (k==niveau) continuer=0; a=fgetc(fichier); diff --git a/src/niveau.c b/src/niveau.c index 968a0c6..e1a45b8 100644 --- a/src/niveau.c +++ b/src/niveau.c @@ -10,6 +10,7 @@ #ifdef HW_SCREEN_RESIZE extern SDL_Surface *hw_screen; #endif //HW_SCREEN_RESIZE +extern SDL_Surface *screen; int niveau_1_joueur(SDL_Surface *screen, int niveau){ int continuer = 1; @@ -34,6 +35,7 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ menu = IMG_Load("sprite/legende_editeur.png"); break; case 0: + printf("File: %s, func: %s, l.%d \n",__FILE__, __func__, __LINE__); menu = IMG_Load("sprite/win_the_game.png"); break; case 1: @@ -67,17 +69,30 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ menu = IMG_Load("sprite/niveau_10.png"); break; } + + /** Display menu */ positionMenu.x = 0; positionMenu.y = 0; + SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); + SDL_BlitSurface(menu, NULL, screen, &positionMenu); + if(menu != NULL) SDL_FreeSurface(menu); +#ifdef HW_SCREEN_RESIZE + flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, + HW_SCREEN_WIDTH, + MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); + SDL_Flip(hw_screen); +#else //HW_SCREEN_RESIZE + SDL_Flip(screen); +#endif //HW_SCREEN_RESIZE /** Wait for input */ while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { case SDL_QUIT: - if(menu != NULL) SDL_FreeSurface(menu); return 1; break; case SDL_KEYDOWN: @@ -86,7 +101,6 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ case SDLK_ESCAPE: case SDLK_q: case SDLK_b: - if(menu != NULL) SDL_FreeSurface(menu); return 1; break; case SDLK_RETURN: @@ -97,18 +111,7 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ default: break; } } - SDL_FillRect(screen, NULL, SDL_MapRGB(screen->format, 0, 0, 0)); - SDL_BlitSurface(menu, NULL, screen, &positionMenu); -#ifdef HW_SCREEN_RESIZE - flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, - HW_SCREEN_WIDTH, - MIN(screen->h*HW_SCREEN_WIDTH/screen->w, HW_SCREEN_HEIGHT)); - SDL_Flip(hw_screen); -#else //HW_SCREEN_RESIZE - SDL_Flip(screen); -#endif //HW_SCREEN_RESIZE } - if(menu != NULL) SDL_FreeSurface(menu); return 0; } @@ -154,6 +157,7 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){ } while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { @@ -275,6 +279,7 @@ int editeur_choix_niveau(SDL_Surface *screen){ menu = IMG_Load("sprite/niveau_2p_1.png"); while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { @@ -403,6 +408,7 @@ int are_you_sure(SDL_Surface *screen){ menu = IMG_Load("sprite/sure_yes.png"); while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { @@ -496,6 +502,7 @@ int choix_nb_joueurs(SDL_Surface *screen){ menu = IMG_Load("sprite/menu_nb_joueur_1.png"); while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) { @@ -585,6 +592,7 @@ int options(SDL_Surface *screen){ menu = IMG_Load("sprite/options_s_o.png"); while (continuer) { + SDL_Delay(150); // For debounce SDL_WaitEvent(&event); switch(event.type) {