diff --git a/.gitignore b/.gitignore index 1caede8..7d76e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,7 @@ *.i*86 *.x86_64 *.hex -bomber +bibi # Debug files *.dSYM/ diff --git a/Makefile b/Makefile index 4ce001e..5aa62f0 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ LDFLAGS = $(SDL_LIBS) -lSDL_image $(LDFLAGS_EXTRA) SRC = $(wildcard src/*.c) OBJ = $(SRC:.c=.o) -EXEC = bomber +EXEC = bibi .PHONY: all dep clean mrproper diff --git a/root@192.168.137.145 b/root@192.168.137.145 deleted file mode 100755 index 297116d..0000000 Binary files a/root@192.168.137.145 and /dev/null differ diff --git a/src/main.c b/src/main.c index 257df6b..c232cc4 100644 --- a/src/main.c +++ b/src/main.c @@ -507,7 +507,7 @@ int main_menu_and_game() { SDL_WM_SetIcon(IMG_Load(IMG_PLAYER_DOWN), NULL); SDL_WM_SetCaption("[PG110] Projet 2010", NULL); - +printf("File: %s, func: %s, l.%d \n",__FILE__, __func__, __LINE__); /** Load audio */ #ifdef SOUND_FMOD_ACTIVATED FMUSIC_MODULE *musique_menu_p; @@ -1270,7 +1270,6 @@ int main_game_no_menu() { int main(int argc, char *argv[]) { #ifdef BYPASS_MENU return main_game_no_menu(); - #else return main_menu_and_game(); #endif diff --git a/src/menu.c b/src/menu.c index 5ef13cd..8e9daa9 100644 --- a/src/menu.c +++ b/src/menu.c @@ -10,7 +10,6 @@ #include #include #include -#include #include "../include/constant.h" #include "../include/misc.h"