From 72b892b36cac797c581c3fa673260f340f1e1e65 Mon Sep 17 00:00:00 2001
From: Romain Jegat <romain.jegat@insa-rennes.fr>
Date: Wed, 4 May 2016 18:46:59 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20de=20resources=20graphiques=20-=20Merci?=
 =?UTF-8?q?=20d'ajouter=20leur=20r=C3=A9f=C3=A9rence=20dans=20GUI.xml=20?=
 =?UTF-8?q?=C3=A0=20chaque=20nouvel=20ajout=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/GUI.xml         |  18 ++++++++++++++++++
 resources/Skins/coeur.bmp | Bin 0 -> 6494 bytes
 resources/Skins/mana.bmp  | Bin 0 -> 8874 bytes
 src/competence.c          |   8 ++++----
 src/main.c                |   1 -
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 resources/Skins/coeur.bmp
 create mode 100644 resources/Skins/mana.bmp

diff --git a/resources/GUI.xml b/resources/GUI.xml
index da74b19..dbac094 100644
--- a/resources/GUI.xml
+++ b/resources/GUI.xml
@@ -6,5 +6,23 @@
     </Skin>
     <Skin id="ST_QUIT" f_default="../resources/Skins/quitter.bmp">
     </Skin>
+    <Skin id="ST_ENTER" f_default="../resources/Skins/Entrer_Royaume.bmp">
+    </Skin>
+    <Skin id="ST_HEART" f_default="../resources/Skins/coeur.bmp">
+    </Skin>
+    <Skin id="ST_MANA" f_default="../resources/Skins/mana.bmp">
+    </Skin>
+    <Skin id="ST_LOGO" f_default="../resources/Skins/logo.bmp">
+    </Skin>
+    <Skin id="ST_MAP1" f_default="../resources/Skins/Map_1.bmp">
+    </Skin>
+    <Skin id="ST_MAP2" f_default="../resources/Skins/Map_2.bmp">
+    </Skin>
+    <Skin id="ST_MAP3" f_default="../resources/Skins/Map_3.bmp">
+    </Skin>
+    <Skin id="ST_MAP4" f_default="../resources/Skins/Map_4.bmp">
+    </Skin>
+    <Skin id="ST_MAP5" f_default="../resources/Skins/Map_5.bmp">
+    </Skin>
   </Textures>
 </Interface>
diff --git a/resources/Skins/coeur.bmp b/resources/Skins/coeur.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..a694ea6bd61d7d4fbc7c2a50e8a0c89cc512b368
GIT binary patch
literal 6494
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

literal 0
HcmV?d00001

diff --git a/resources/Skins/mana.bmp b/resources/Skins/mana.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..b3dce567f1c02894bc4a5ca5312dbd6b237c7794
GIT binary patch
literal 8874
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

literal 0
HcmV?d00001

diff --git a/src/competence.c b/src/competence.c
index 4e551f0..d9934df 100644
--- a/src/competence.c
+++ b/src/competence.c
@@ -242,15 +242,15 @@ int Extraire_Comp_Tree(node_t *arbreXML, Competence* arbreComp)
         Competence *comp = init_Competence();
 
         brancheXML = roxml_get_chld(arbreXML, NULL, i);
-        printf("--> Extraction de la competence %d sur %d \n", i+1, nb_Comp);
+        //printf("--> Extraction de la competence %d sur %d \n", i+1, nb_Comp);
 
         set_comp_name(comp, roxml_get_content(roxml_get_attr(brancheXML,"nom",0),NULL,0,NULL));
         set_comp_id(comp, roxml_get_content(roxml_get_attr(brancheXML,"id",0),NULL,0,NULL));
         set_comp_prix(comp, atoi(roxml_get_content(roxml_get_attr(brancheXML,"prix",0),NULL,0,NULL)));
 
-        printf("La competence actuelle a pour nom : %s\n", comp->nomComp);
-        printf("La competence actuelle a pour id : %s\n", comp->id);
-        printf("La competence actuelle a pour prix : %d\n", comp->prix_competence);
+        //printf("La competence actuelle a pour nom : %s\n", comp->nomComp);
+        //printf("La competence actuelle a pour id : %s\n", comp->id);
+        //printf("La competence actuelle a pour prix : %d\n", comp->prix_competence);
 
         Extraire_Comp_Tree(brancheXML, comp);
 
diff --git a/src/main.c b/src/main.c
index 41c0011..4c66dfa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -124,7 +124,6 @@ Pack_A.Competences_Package = Competences_Pack;
     //main_SDL(Map_ANCIENNE_VERSION);
     //SDL_bis();
 
-    //Test_Competences();
 
 
 
-- 
GitLab