From 987c20f3519a5f8d472cad8e30e752a2cd844612 Mon Sep 17 00:00:00 2001
From: Romain Jegat <romain.jegat@insa-rennes.fr>
Date: Sat, 23 Apr 2016 01:07:47 +0200
Subject: [PATCH] =?UTF-8?q?Suppression=20de=20printf=20dans=20carte.c,=20m?=
=?UTF-8?q?ise=20=C3=A0=20jour=20du=20fichier=20Cbp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ElderInternalIgnition.cbp | 20 +++++++++++++++---
src/carte.c | 21 -------------------
2 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ElderInternalIgnition/ElderInternalIgnition.cbp b/ElderInternalIgnition/ElderInternalIgnition.cbp
index e9f1db8..33f8aad 100644
--- a/ElderInternalIgnition/ElderInternalIgnition.cbp
+++ b/ElderInternalIgnition/ElderInternalIgnition.cbp
@@ -35,9 +35,9 @@
<Add directory="../Libs/cmocka-1.0.0/include" />
</Compiler>
<Linker>
- <Add library="../Libs/libroxml-2.3.0/Build/libroxml.dll" />
- <Add library="./../Libs/SDL-1.2.15/bin/SDL.dll" />
- <Add library="../Libs/cmocka-1.0.0/lib/cmocka.dll.a" />
+ <Add library="..\Libs\libroxml-2.3.0\Build\libroxml.dll" />
+ <Add library=".\..\Libs\SDL-1.2.15\bin\SDL.dll" />
+ <Add library="..\Libs\cmocka-1.0.0\lib\cmocka.dll.a" />
<Add directory="./../Libs" />
<Add directory="../Libs/cmocka-1.0.0/lib" />
</Linker>
@@ -53,6 +53,12 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/SDL.h" />
+ <Unit filename="../src/TU_main.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/TU_partie.c">
+ <Option compilerVar="CC" />
+ </Unit>
<Unit filename="../src/TerrainsXML.c">
<Option compilerVar="CC" />
</Unit>
@@ -62,6 +68,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/affichageConsole2.h" />
+ <Unit filename="../src/carte.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/carte.h" />
<Unit filename="../src/case.c">
<Option compilerVar="CC" />
</Unit>
@@ -78,6 +88,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/controleur.h" />
+ <Unit filename="../src/controleurSDL.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/controleurSDL.h" />
<Unit filename="../src/deplacements.c">
<Option compilerVar="CC" />
</Unit>
diff --git a/src/carte.c b/src/carte.c
index 830bb3b..b72e5b8 100644
--- a/src/carte.c
+++ b/src/carte.c
@@ -31,12 +31,9 @@ char* LireCarte(const char *filename, int num)
fseek(file_map, 1, SEEK_CUR);
(fgets(char_nb_colonnes,3,file_map));
nb_colonnes = atoi(char_nb_colonnes);
- printf("Nb map = %d, Nb colonne = %d, Nb ligne = %d\n\n",num_map,nb_colonnes,nb_lignes);
- //num_map++;
while(num_map < num)
{
-
for(k=0; k<nb_colonnes+4; k++) /*! Descend jusqu'à la prochaine map */
{
fseek(file_map,nb_lignes,SEEK_CUR);
@@ -49,25 +46,7 @@ char* LireCarte(const char *filename, int num)
fseek(file_map, 1, SEEK_CUR);
(fgets(char_nb_colonnes,3,file_map));
nb_colonnes = atoi(char_nb_colonnes);
- printf("Nb map = %d, Nb colonne = %d, Nb ligne = %d\n\n",num_map,nb_colonnes,nb_lignes);
-
- //num_map++;
- }
- /*for(k=0;k<15;k++)
- {
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
- printf("Le caractere detecte est : %c\n",fgetc(file_map));
}
- */
-
-
fseek(file_map, 4, SEEK_CUR);
--
GitLab