From f69e0c1513cb0172b5b967d71d18f6aa28048946 Mon Sep 17 00:00:00 2001
From: Sanchez Alexandre <alexandre.sanchez@insa-rennes.fr>
Date: Fri, 29 Apr 2016 10:53:32 +0200
Subject: [PATCH] [Fix] pb avec la lecture XML
---
resources/Classes.xml | 8 ++++----
src/ClassesXML.c | 12 ++++++------
src/classe.c | 5 +++--
3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/resources/Classes.xml b/resources/Classes.xml
index 0c4e575..6c4de50 100644
--- a/resources/Classes.xml
+++ b/resources/Classes.xml
@@ -13,7 +13,7 @@
<Effect id="" name="" TURNS="" DM="10" PARA="PARA_NO" />
</Skill>
</Skills>
- <Skins id="SP_MAGE" f_default="../resources/Skins/mage.bmp" f_selected="../resources/Skins/mage_selected.bmp" f_healed="../resources/Skins/mage_healed.bmp" f_damaged="../resources/Skins/mage_damaged.bmp">
+ <Skin id="SP_MAGE" f_default="../resources/Skins/mage.bmp" f_selected="../resources/Skins/mage_selected.bmp" f_healed="../resources/Skins/mage_healed.bmp" f_damaged="../resources/Skins/mage_damaged.bmp">
</Skins>
</Classe>
<Classe id="C_WAR" name="Guerrier" PV="200" PM="150" MV="2" Desc="Aime beaucoup le street art">
@@ -44,7 +44,7 @@
</Skill>
</Skills>
<Skin id="SP_HEAL" f_default="../resources/Skins/guerisseur.bmp" f_selected="../resources/Skins/guerisseur_selected.bmp" f_healed="../resources/Skins/guerisseur_healed.bmp" f_damaged="../resources/Skins/guerisseur_damaged.bmp">
- </Skin>
+ </Skin>
</Classe>
<Classe id="C_ROGUE" name="Voleur" PV="100" PM="150" MV="2" Desc="60 minutes, ça vaut l'heure">
<Skills>
@@ -72,8 +72,8 @@
<Skill id="S_PARA" name="Tir paralysant" RG="" MN="">
<Effect id="" name="" TURNS="" DM="10" PARA="PARA_NO" />
</Skill>
- <Skin id="SP_ARCHER" f_default="../resources/Skins/voleurarcher.bmp" f_selected="../resources/Skins/archer_selected.bmp" f_healed="../resources/Skins/archer_healed.bmp" f_damaged="../resources/Skins/archer_damaged.bmp">
- </Skin>
</Skills>
+ <Skin id="SP_ARCHER" f_default="../resources/Skins/voleurarcher.bmp" f_selected="../resources/Skins/archer_selected.bmp" f_healed="../resources/Skins/archer_healed.bmp" f_damaged="../resources/Skins/archer_damaged.bmp">
+ <Skin>
</Classe>
</Classes>
diff --git a/src/ClassesXML.c b/src/ClassesXML.c
index 8e7d2f0..24040a8 100644
--- a/src/ClassesXML.c
+++ b/src/ClassesXML.c
@@ -120,7 +120,7 @@ int /*Classe**/ Remplir_Classes(FILE* Classes_log, char *filename) /* Remplit le
Skills = roxml_get_chld(Classe_node, NULL, 0);
nb_skills = roxml_get_chld_nb(Skills);
- for(j=0 ; (j<nb_skills)||(j<4) ; j++)
+ for(j=0 ; j<nb_skills ; j++)
{
char *id_Skill_text, *name_Skill_text;
@@ -149,7 +149,7 @@ int /*Classe**/ Remplir_Classes(FILE* Classes_log, char *filename) /* Remplit le
Classe_en_cours.attaques[j].portee=RG_int;
Classe_en_cours.attaques[j].mana=MN_int;
- for(k=0 ; (k<nb_Effects)||(k<4) ; k++)
+ for(k=0 ; k<nb_Effects; k++)
{
char *id_Effect_text, *name_Effect_text;
int TURNS_int, DM_int, DM_DUR_int, HL_int, HL_DUR_int, PARA_int, TRNS_int;
@@ -160,11 +160,11 @@ int /*Classe**/ Remplir_Classes(FILE* Classes_log, char *filename) /* Remplit le
/* Aquisition de l'effet en cours */
id_Effect_text = roxml_get_content(roxml_get_attr(Effect, "id", 0), NULL, 0, NULL);
name_Effect_text = roxml_get_content(roxml_get_attr(Effect, "name", 0), NULL, 0, NULL);
- TRNS_int = atoi(roxml_get_content(roxml_get_attr(Effect, "TRNS", 0), NULL, 0, NULL));
+ TRNS_int = atoi(roxml_get_content(roxml_get_attr(Effect, "TURNS", 0), NULL, 0, NULL));
DM_int = atoi(roxml_get_content(roxml_get_attr(Effect, "DM", 0), NULL, 0, NULL));
- DM_DUR_int = atoi(roxml_get_content(roxml_get_attr(Effect, "DM_DUR", 0), NULL, 0, NULL));
- HL_int = atoi(roxml_get_content(roxml_get_attr(Effect, "HL", 0), NULL, 0, NULL));
- HL_DUR_int = atoi(roxml_get_content(roxml_get_attr(Effect, "HL_DUR", 0), NULL, 0, NULL));
+// DM_DUR_int = atoi(roxml_get_content(roxml_get_attr(Effect, "DM_DUR", 0), NULL, 0, NULL));
+// HL_int = atoi(roxml_get_content(roxml_get_attr(Effect, "HL", 0), NULL, 0, NULL));
+// HL_DUR_int = atoi(roxml_get_content(roxml_get_attr(Effect, "HL_DUR", 0), NULL, 0, NULL));
PARA_int = atoi(roxml_get_content(roxml_get_attr(Effect, "PARA", 0), NULL, 0, NULL));
/* Ecriture de l'effet en cours dans le fichier log */
diff --git a/src/classe.c b/src/classe.c
index e31000b..fe557e2 100644
--- a/src/classe.c
+++ b/src/classe.c
@@ -19,20 +19,21 @@ return Remplir_Classes_log(filename);
/* Generation d'un fichier log decrivant le deroulement de la procedure d'aquisition des classes */
Classe* Remplir_Classes_log(char *filename)
{
+ int ret = 0;
FILE* Classes_log = NULL;
Classes_log = fopen("Classes_XML_log", "w");
if (Classes_log != NULL)
{
fprintf(Classes_log,"Fichier decrivant le deroulement de la procedure d'aquisition des classes\n\n");
- return Remplir_Classes(Classes_log, filename);
+ ret = Remplir_Classes(Classes_log, filename);
fclose(Classes_log);
}
else
{
fprintf(stderr,"Impossible d'ouvrir le fichier Classes_XML_log");
- return 0;
}
+ return ret;
}
/*!
--
GitLab