diff --git a/ElderInternalIgnition/ElderInternalIgnition.cbp b/ElderInternalIgnition/ElderInternalIgnition.cbp index 753729e9d2d5b4f214c567d5fc9eff0831732846..80ab101ae538a80eeecb3724d49bd8848f764779 100644 --- a/ElderInternalIgnition/ElderInternalIgnition.cbp +++ b/ElderInternalIgnition/ElderInternalIgnition.cbp @@ -6,6 +6,7 @@ <Option pch_mode="2" /> <Option compiler="gcc" /> <Build> + <Script file="lib_finder.script" /> <Target title="Debug"> <Option output="./../build/bin/Debug/ElderInternalIgnition" prefix_auto="1" extension_auto="1" /> <Option object_output="./../build/obj/Debug/" /> @@ -29,12 +30,13 @@ </Target> </Build> <Compiler> - <Add option="-Wall" /> <Add directory="./../Libs/libroxml-2.3.0/src" /> <Add directory="./../src" /> + <Add directory="./../Libs/SDL-1.2.15/include" /> </Compiler> <Linker> <Add library="../Libs/libroxml-2.3.0/Build/libroxml.dll" /> + <Add library="./../Libs/SDL-1.2.15/bin/SDL.dll" /> <Add directory="./../Libs" /> </Linker> <Unit filename="../src/AffichageConsole.c"> @@ -45,14 +47,19 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/ClassesXML.h" /> + <Unit filename="../src/SDL.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/SDL.h" /> <Unit filename="../src/TerrainsXML.c"> <Option compilerVar="CC" /> </Unit> <Unit filename="../src/TerrainsXML.h" /> - <Unit filename="../src/affichage.c"> + <Unit filename="../src/affichage.h" /> + <Unit filename="../src/affichageConsole2.c"> <Option compilerVar="CC" /> </Unit> - <Unit filename="../src/affichage.h" /> + <Unit filename="../src/affichageConsole2.h" /> <Unit filename="../src/case.c"> <Option compilerVar="CC" /> </Unit> @@ -65,6 +72,10 @@ <Option compilerVar="CC" /> </Unit> <Unit filename="../src/competence.h" /> + <Unit filename="../src/controleur.c"> + <Option compilerVar="CC" /> + </Unit> + <Unit filename="../src/controleur.h" /> <Unit filename="../src/deplacements.c"> <Option compilerVar="CC" /> </Unit> @@ -80,6 +91,9 @@ <Unit filename="../src/main.c"> <Option compilerVar="CC" /> </Unit> + <Unit filename="../src/mainPartieConsole.c"> + <Option compilerVar="CC" /> + </Unit> <Unit filename="../src/partie.c"> <Option compilerVar="CC" /> </Unit> diff --git a/ElderInternalIgnition/SDL.dll b/ElderInternalIgnition/SDL.dll new file mode 100644 index 0000000000000000000000000000000000000000..781b54d6ee5d89abc7e26f8405ef29f99ee68c2f Binary files /dev/null and b/ElderInternalIgnition/SDL.dll differ diff --git a/ElderInternalIgnition/libroxml.dll b/ElderInternalIgnition/libroxml.dll new file mode 100644 index 0000000000000000000000000000000000000000..40468f6d55be39c78ca832566d612e2000069ba7 Binary files /dev/null and b/ElderInternalIgnition/libroxml.dll differ diff --git a/src/affichageConsole2.c b/src/affichageConsole2.c index b223f34faa7035098cae3e82b60f7755fecfd024..4aba73b11a36ec8fe46e28b35775d7e63b222483 100644 --- a/src/affichageConsole2.c +++ b/src/affichageConsole2.c @@ -9,7 +9,7 @@ */ void affichePremierChoix(char * c, int * i){ printf("%s : Que voulez-vous faire?\n 1-Sélectionner un personnage\n 2-Fin du tour\n", c); - scanf("%d",&i); + scanf("%d",i); printf("\n"); } @@ -21,10 +21,10 @@ void affichePremierChoix(char * c, int * i){ */ void afficherEntrerCoordonnees(int * cX, int * cY){ printf("Entrez une abscisse : x = "); - scanf("%d",&cX); + scanf("%d",cX); printf("\n"); printf("Entrez une ordonnée : y = "); - scanf("%d",&cY); + scanf("%d",cY); printf("\n"); }