diff --git a/resources/GUI.xml b/resources/GUI.xml index da74b1997ec1beb509d088cf47b488e0ff8cb6b0..dbac094c1dfe7d3b353277549f22a0cea9f60615 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 Binary files /dev/null and b/resources/Skins/coeur.bmp differ diff --git a/resources/Skins/mana.bmp b/resources/Skins/mana.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b3dce567f1c02894bc4a5ca5312dbd6b237c7794 Binary files /dev/null and b/resources/Skins/mana.bmp differ diff --git a/src/competence.c b/src/competence.c index 4e551f063f2d91617957e2f38f81a1989954caf1..d9934dfb6cb4fc92ea124b3ea7899d3c8a23962e 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 41c0011c4793c4ff6ee9eb613d8b630a6531bda7..4c66dfad766f4e6365f7b99e3bf8e392a397a5c7 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();