diff --git a/.depend b/.depend index 7daea29..13c7d38 100644 --- a/.depend +++ b/.depend @@ -1,32 +1,17 @@ -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 \ +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 \ src/../include/game.h src/../include/../include/constant.h \ src/../include/../include/misc.h src/../include/../include/map.h \ src/../include/../include/player.h \ @@ -34,62 +19,34 @@ player.o: src/player.c \ 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 \ - /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 \ + /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 \ src/../include/constant.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 \ +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 \ src/../include/game.h src/../include/../include/constant.h \ src/../include/../include/misc.h src/../include/../include/map.h \ src/../include/../include/player.h \ @@ -98,130 +55,71 @@ flamme.o: src/flamme.c \ src/../include/../include/flamme.h game.o: src/game.c src/../include/game.h \ src/../include/../include/constant.h src/../include/../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 \ + /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/../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 \ - /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 \ +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 \ 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 \ - /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 \ +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 \ 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 \ @@ -229,101 +127,56 @@ main.o: src/main.c \ 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 \ - /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 \ +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 \ 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 \ - /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 \ +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 \ 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 \ @@ -331,35 +184,20 @@ map.o: src/map.c \ 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 \ - /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 \ +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 \ 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/Makefile b/Makefile index b154110..b7de4f6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ CC = $(CROSS_COMPILE)gcc -g -TARGET_FUNKEY ?= 1 +TARGET_FUNKEY ?= 0 ifeq ($(TARGET_FUNKEY),1) diff --git a/src/main.c b/src/main.c index 9fd8950..7ce63db 100644 --- a/src/main.c +++ b/src/main.c @@ -38,7 +38,8 @@ int input_update(t_game game, int nb_joueur) { t_map map = game_the_map(game); int x, y; - while (SDL_PollEvent(&event)) { + // Loop through all pending events and process only the latest one + while (SDL_PollEvent(&event)){ switch (event.type) { case SDL_QUIT: return 2; @@ -46,9 +47,11 @@ int input_update(t_game game, int nb_joueur) { case SDL_KEYDOWN: switch (event.key.keysym.sym) { case SDLK_ESCAPE: + case SDLK_q: return 2; case SDLK_UP: + case SDLK_u: player_set_current_way(player1, UP); player_move(player1, map); if (player_win(player1)==1){ @@ -57,6 +60,7 @@ int input_update(t_game game, int nb_joueur) { break; case SDLK_DOWN: + case SDLK_d: player_set_current_way(player1, DOWN); player_move(player1, map); if (player_win(player1)==1){ @@ -65,6 +69,7 @@ int input_update(t_game game, int nb_joueur) { break; case SDLK_RIGHT: + case SDLK_r: player_set_current_way(player1, RIGHT); player_move(player1, map); if (player_win(player1)==1){ @@ -73,6 +78,7 @@ int input_update(t_game game, int nb_joueur) { break; case SDLK_LEFT: + case SDLK_l: player_set_current_way(player1, LEFT); player_move(player1, map); if (player_win(player1)==1){ @@ -80,20 +86,11 @@ int input_update(t_game game, int nb_joueur) { } break; - case SDLK_END: //sert à poser une bombe pour le joueur 1 (cette touche sert - x= player_get_x(player1); //pour les ordinateurs portables qui n'ont pas forcément la touce 0 à côté des flèches directionnelles) - y= player_get_y(player1); - - if (player_get_nb_bomb(player1)>0 && map_get_cell_type(map,x,y)!=CELL_BOMB){ - int portee=player_portee_bomb(player1); - game_init_bomb(game,x,y,portee,1); - map_set_cell_type(map, x, y, CELL_BOMB); - player_decrease_nb_bomb(player1); - } - break; - - - case SDLK_KP0: //sert à poser une bombe pour le joueur 1 + //sert à poser une bombe pour le joueur 1 + case SDLK_END: //cette touche sert pour les ordinateurs portables qui n'ont pas forcément la touce 0 à côté des flèches directionnelles) + case SDLK_KP0: + case SDLK_a: + case SDLK_b: x= player_get_x(player1); y= player_get_y(player1); @@ -105,7 +102,8 @@ int input_update(t_game game, int nb_joueur) { } break; - // touches du joueur 2: + /* + // touches du joueur 2: case SDLK_e: if (nb_joueur == 2){ player_set_current_way(player2, UP); @@ -156,6 +154,7 @@ int input_update(t_game game, int nb_joueur) { } } break; + */ default: break; } @@ -187,7 +186,7 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill t_game game = game_new(nb_joueur,niveau,mode, kill_bomb); //on lance le jeu #ifdef HW_SCREEN_RESIZE - //if(screen != NULL) SDL_FreeSurface(screen); + if(screen != NULL) SDL_FreeSurface(screen); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, SIZE_BLOC * map_get_width(game_the_map(game)), SIZE_BLOC * map_get_height(game_the_map(game)), WINDOW_BPP, 0, 0, 0, 0); @@ -300,7 +299,7 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill } #ifdef HW_SCREEN_RESIZE - //if(screen != NULL) SDL_FreeSurface(screen); + 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); @@ -358,6 +357,7 @@ 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)); SDL_BlitSurface(menu, NULL, screen, &positionMenu); + SDL_FreeSurface(menu); #ifdef HW_SCREEN_RESIZE SDL_FillRect(hw_screen, NULL, 0x000000); flip_NNOptimized_AllowOutOfScreen(screen, hw_screen, @@ -380,22 +380,18 @@ int main_game(SDL_Surface *screen, int nb_joueur, int niveau, int mode, int kill break; case SDL_KEYDOWN: switch(event.key.keysym.sym){ - case SDLK_ESCAPE: - continu = 1; - break; - case SDLK_RETURN: - continu = 1; - break; + case SDLK_ESCAPE: case SDLK_KP_ENTER: + case SDLK_RETURN: + case SDLK_a: + case SDLK_b: continu = 1; - break; default: break; } break; } } } - SDL_FreeSurface(menu); if (nb_joueur==1 && player_win(player1)==1){ game_free(game); @@ -436,7 +432,7 @@ int main(int argc, char *argv[]) { if (hw_screen == NULL) { error("Can't set video mode: %s\n", SDL_GetError()); } - //if(screen != NULL) SDL_FreeSurface(screen); + if(screen != NULL) SDL_FreeSurface(screen); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 700,500, WINDOW_BPP, 0, 0, 0, 0); #else //HW_SCREEN_RESIZE screen = SDL_SetVideoMode(700,500, WINDOW_BPP,SDL_HWSURFACE); @@ -541,17 +537,27 @@ int main(int argc, char *argv[]) { SDL_WaitEvent(&event); switch(event.type) { + case SDL_QUIT: +#ifdef SOUND_FMOD_ACTIVATED //FMUSIC_StopSong(musique_menu_p); +#elif defined(SOUND_SDL_ACTIVATED) + Mix_HaltMusic(); +#endif //SOUND_SDL_ACTIVATED done = 1; break; + case SDL_KEYDOWN: if(event.key.keysym.sym==SDLK_ESCAPE){ // Veut arrêter le jeu - // FMUSIC_StopSong(musique_menu_p); +#ifdef SOUND_FMOD_ACTIVATED + //FMUSIC_StopSong(musique_menu_p); +#elif defined(SOUND_SDL_ACTIVATED) + Mix_HaltMusic(); +#endif //SOUND_SDL_ACTIVATED done = 1; } - else if(event.key.keysym.sym==SDLK_UP){ + else if(event.key.keysym.sym==SDLK_UP || event.key.keysym.sym==SDLK_u){ switch(choix_actuel){ case 1: menu = IMG_Load("sprite/menu_q.png"); @@ -579,7 +585,7 @@ int main(int argc, char *argv[]) { break; } } - else if(event.key.keysym.sym==SDLK_DOWN){ + else if(event.key.keysym.sym==SDLK_DOWN || event.key.keysym.sym==SDLK_d){ switch(choix_actuel){ case 1: menu = IMG_Load("sprite/menu_2_p.png"); @@ -607,7 +613,8 @@ int main(int argc, char *argv[]) { break; } } - else if(event.key.keysym.sym==SDLK_RETURN || event.key.keysym.sym==SDLK_KP_ENTER){ + else if(event.key.keysym.sym==SDLK_RETURN || event.key.keysym.sym==SDLK_KP_ENTER + || event.key.keysym.sym==SDLK_a){ switch(choix_actuel){ case 1: //on rentre dans le mode 1 joueur. @@ -829,18 +836,20 @@ int main(int argc, char *argv[]) { case 6: if(are_you_sure(screen)==1){ - if(audio_init_ok && audio==1) + if(audio_init_ok && audio==1){ #ifdef SOUND_FMOD_ACTIVATED FMUSIC_StopSong(musique_menu_p); #elif defined(SOUND_SDL_ACTIVATED) Mix_HaltMusic(); #endif //SOUND_FMOD_ACTIVATED + } done=1; resize=1; break; } - else - resize=1; + else{ + resize=1; + } break; @@ -855,7 +864,7 @@ int main(int argc, char *argv[]) { if (resize==1){ #ifdef HW_SCREEN_RESIZE - //if(screen != NULL) SDL_FreeSurface(screen); + if(screen != NULL) SDL_FreeSurface(screen); screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 700,500, WINDOW_BPP, 0, 0, 0, 0); #else //HW_SCREEN_RESIZE screen = SDL_SetVideoMode(700,500, WINDOW_BPP,SDL_HWSURFACE); diff --git a/src/niveau.c b/src/niveau.c index 9f05a3d..5c71e56 100644 --- a/src/niveau.c +++ b/src/niveau.c @@ -69,6 +69,7 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ positionMenu.x = 0; positionMenu.y = 0; + /** Wait for input */ while (continuer) { SDL_WaitEvent(&event); @@ -82,13 +83,13 @@ int niveau_1_joueur(SDL_Surface *screen, int niveau){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: + case SDLK_b: SDL_FreeSurface(menu); return 1; break; case SDLK_RETURN: - continuer = 0; - break; case SDLK_KP_ENTER: + case SDLK_a: continuer = 0; break; default: break; @@ -161,9 +162,11 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: // Veut arrêter le jeu + case SDLK_b: // Veut arrêter le jeu continuer=0; break; case SDLK_UP: + case SDLK_u: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/niveau_2p_6.png");; @@ -192,6 +195,7 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){ } break; case SDLK_DOWN: + case SDLK_d: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/niveau_2p_2.png");; @@ -220,10 +224,8 @@ int niveau_2_joueur(SDL_Surface *screen, int choix_niveau){ } break; case SDLK_RETURN: - SDL_FreeSurface(menu); - return choix_actuel; - break; case SDLK_KP_ENTER: + case SDLK_a: SDL_FreeSurface(menu); return choix_actuel; break; @@ -280,9 +282,11 @@ int editeur_choix_niveau(SDL_Surface *screen){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: // Veut arrêter le jeu + case SDLK_b: // Veut arrêter le jeu continuer=0; break; case SDLK_UP: + case SDLK_u: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/niveau_2p_6.png");; @@ -311,6 +315,7 @@ int editeur_choix_niveau(SDL_Surface *screen){ } break; case SDLK_DOWN: + case SDLK_d: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/niveau_2p_2.png");; @@ -339,10 +344,8 @@ int editeur_choix_niveau(SDL_Surface *screen){ } break; case SDLK_RETURN: - SDL_FreeSurface(menu); - return choix_actuel; - break; case SDLK_KP_ENTER: + case SDLK_a: SDL_FreeSurface(menu); return choix_actuel; break; @@ -370,6 +373,10 @@ int editeur_choix_niveau(SDL_Surface *screen){ int are_you_sure(SDL_Surface *screen){ + + #warning Voluntary Bypass FunKey + return 1; + #ifdef HW_SCREEN_RESIZE //if(screen != NULL) SDL_FreeSurface(screen); @@ -381,6 +388,7 @@ int are_you_sure(SDL_Surface *screen){ exit(1); } #endif //HW_SCREEN_RESIZE + int continuer = 1, choix_actuel=1; SDL_Surface *menu = NULL; SDL_Event event; @@ -400,38 +408,43 @@ int are_you_sure(SDL_Surface *screen){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: // Veut arrêter le jeu + case SDLK_b: // Veut arrêter le jeu continuer=0; break; case SDLK_LEFT: + case SDLK_l: switch(choix_actuel){ case 1: + if(menu != NULL) SDL_FreeSurface(menu); menu = IMG_Load("sprite/sure_no.png");; choix_actuel=2; break; case 2: + if(menu != NULL) SDL_FreeSurface(menu); menu = IMG_Load("sprite/sure_yes.png"); choix_actuel=1; break; } break; case SDLK_RIGHT: + case SDLK_r: switch(choix_actuel){ case 1: + if(menu != NULL) SDL_FreeSurface(menu); menu = IMG_Load("sprite/sure_no.png");; choix_actuel=2; break; case 2: + if(menu != NULL) SDL_FreeSurface(menu); menu = IMG_Load("sprite/sure_yes.png"); choix_actuel=1; break; } break; case SDLK_RETURN: - SDL_FreeSurface(menu); - return choix_actuel; - break; case SDLK_KP_ENTER: - SDL_FreeSurface(menu); + case SDLK_a: + if(menu != NULL) SDL_FreeSurface(menu); return choix_actuel; break; @@ -487,9 +500,11 @@ int choix_nb_joueurs(SDL_Surface *screen){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: // Veut arrêter le jeu + case SDLK_b: // Veut arrêter le jeu continuer=0; break; case SDLK_UP: + case SDLK_u: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/menu_nb_joueur_2.png");; @@ -502,6 +517,7 @@ int choix_nb_joueurs(SDL_Surface *screen){ } break; case SDLK_DOWN: + case SDLK_d: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/menu_nb_joueur_2.png");; @@ -514,10 +530,8 @@ int choix_nb_joueurs(SDL_Surface *screen){ } break; case SDLK_RETURN: - SDL_FreeSurface(menu); - return choix_actuel; - break; case SDLK_KP_ENTER: + case SDLK_a: SDL_FreeSurface(menu); return choix_actuel; break; @@ -574,9 +588,11 @@ int options(SDL_Surface *screen){ switch(event.key.keysym.sym) { case SDLK_ESCAPE: // Veut arrêter le jeu + case SDLK_b: // Veut arrêter le jeu continuer=0; break; case SDLK_LEFT: + case SDLK_l: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/options_s_n.png");; @@ -597,6 +613,7 @@ int options(SDL_Surface *screen){ } break; case SDLK_RIGHT: + case SDLK_r: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/options_s_n.png");; @@ -617,6 +634,7 @@ int options(SDL_Surface *screen){ } break; case SDLK_UP: + case SDLK_u: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/options_b_o.png");; @@ -637,6 +655,7 @@ int options(SDL_Surface *screen){ } break; case SDLK_DOWN: + case SDLK_d: switch(choix_actuel){ case 1: menu = IMG_Load("sprite/options_b_o.png");; @@ -657,10 +676,8 @@ int options(SDL_Surface *screen){ } break; case SDLK_RETURN: - SDL_FreeSurface(menu); - return choix_actuel; - break; case SDLK_KP_ENTER: + case SDLK_a: SDL_FreeSurface(menu); return choix_actuel; break;