diff --git a/EII_jeu/EII_jeu.layout b/EII_jeu/EII_jeu.layout
new file mode 100644
index 0000000000000000000000000000000000000000..593c06edab1c4e23b93e52d0cabe37e45a16ff52
--- /dev/null
+++ b/EII_jeu/EII_jeu.layout
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+ <FileVersion major="1" minor="0" />
+ <ActiveTarget name="Debug" />
+</CodeBlocks_layout_file>
diff --git a/ElderInternalIgnition/ElderInternalIgnition.cbp b/ElderInternalIgnition/ElderInternalIgnition.cbp
index 56520dfaa58138ae57b7978784464ed603115081..a6b37fabe20d529df0036d126baba7bd98d7ee50 100644
--- a/ElderInternalIgnition/ElderInternalIgnition.cbp
+++ b/ElderInternalIgnition/ElderInternalIgnition.cbp
@@ -15,7 +15,7 @@
<Add option="-g" />
</Compiler>
<Linker>
- <Add library="..\Libs\SDL-1.2.15\lib\SDL_ttf.lib" />
+ <Add library="../Libs/SDL-1.2.15/lib/SDL_ttf.lib" />
<Add directory="../Libs/SDL-1.2.15" />
</Linker>
</Target>
@@ -39,17 +39,13 @@
<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\SDL-1.2.15\lib\SDL_ttf.lib" />
+ <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/SDL-1.2.15/lib/SDL_ttf.lib" />
<Add directory="./../Libs" />
<Add directory="../Libs/cmocka-1.0.0/lib" />
</Linker>
- <Unit filename="../src/AffichageConsole.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="../src/AffichageConsole.h" />
<Unit filename="../src/ClassesXML.c">
<Option compilerVar="CC" />
</Unit>
@@ -62,6 +58,9 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/SDL.h" />
+ <Unit filename="../src/SDL_bis.c">
+ <Option compilerVar="CC" />
+ </Unit>
<Unit filename="../src/TerrainsXML.c">
<Option compilerVar="CC" />
</Unit>
@@ -71,11 +70,6 @@
<Option target="<{~None~}>" />
</Unit>
<Unit filename="../src/TexturesXML.h" />
- <Unit filename="../src/affichage.h" />
- <Unit filename="../src/affichageConsole2.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="../src/affichageConsole2.h" />
<Unit filename="../src/carte.c">
<Option compilerVar="CC" />
</Unit>
@@ -104,6 +98,10 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="../src/deplacements.h" />
+ <Unit filename="../src/gamePackage.c">
+ <Option compilerVar="CC" />
+ </Unit>
+ <Unit filename="../src/gamePackage.h" />
<Unit filename="../src/joueur.c">
<Option compilerVar="CC" />
</Unit>
@@ -115,9 +113,6 @@
<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/src/controleur.c b/src/controleur.c
index 2e9c69e5beadc8ecab6f559ff112265bd5a334cb..65fcb3f56a73399ff173dbaff29f70af2654eb3b 100644
--- a/src/controleur.c
+++ b/src/controleur.c
@@ -8,9 +8,37 @@
#include "partie.h"
#include "joueur.h"
-#include "affichageConsole2.h"
#include "joueurList.h"
#include "case.h"
#include "personnage.h"
#include "classe.h"
+#include "gamePackage.h"
+
+Partie * partieGlobale;
+Game_Package packGlobal;
+
+ /*!
+ * \fn void initJeu()
+ * \brief La fonction initialise les variable globales du package du jeu et de la Partie
+ */
+void initJeu(){
+ partieGlobale = initPartie();
+ packGlobal = Construire_Package();
+}
+
+/*!
+ * \fn void ajouterUnJoueur(char * nomDuJoueur, Et)
+ * \brief Fonction de construction d'un package contenant l'univers du jeu
+ *
+ * \return un Game_Package
+ */
+ void ajouterUnJoueur(char * nomDuJoueur, EtatsJeu * etat){
+ Joueur * j = nouveauJoueur();
+ setNomJoueur(j,nomDuJoueur);
+ addParticipant(partieGlobale,j);
+ }
+
+
+
+
diff --git a/src/controleur.h b/src/controleur.h
index 22184256061d2ad00aa2405ae1a7d0687b65be47..c14fa45f19ab68bff8db563297a9b1ab3c1e8359 100644
--- a/src/controleur.h
+++ b/src/controleur.h
@@ -8,6 +8,7 @@
#ifndef CONTROLEUR_H
#define CONTROLEUR_H
+void initJeu();
#endif // CONTROLEUR_H
diff --git a/src/gamePackage.c b/src/gamePackage.c
new file mode 100644
index 0000000000000000000000000000000000000000..7fdfcbd40b1c304e4781761e223eb797b70ae3d0
--- /dev/null
+++ b/src/gamePackage.c
@@ -0,0 +1,33 @@
+/*!
+* \file gamePackage.c
+* \brief Fichier contenant le code des fonctions liees aux gamePackage.
+*/
+
+#include "structures.h"
+#include "roxml.h"
+#include "Interface.h"
+#include "gamePackage.h"
+
+/*!
+ * \fn Game_Package Construire_Package()
+ * \brief Fonction de construction d'un package contenant l'univers du jeu
+ *
+ * \return un Game_Package
+ */
+Game_Package Construire_Package()
+{
+ Game_Package Pack;
+
+ Classe* Classes_Pack = Librairie_Classes("../resources/Classes.xml");
+ Terrain* Terrains_Pack = Librairie_Terrains("../resources/Terrains.xml");
+ Skins_GUI* GUI_Pack = Get_Skins_GUI("../resources/GUI.xml");
+ Carte_A* Map_Pack = ExtraireCartesXML("../resources/Maps.xml");
+
+ Pack.Classes_Package = Classes_Pack;
+ Pack.Terrains_Package = Terrains_Pack;
+ Pack.GUI_Package = GUI_Pack;
+ Pack.Cartes_Package = Map_Pack;
+
+ return Pack;
+}
+
diff --git a/src/gamePackage.h b/src/gamePackage.h
new file mode 100644
index 0000000000000000000000000000000000000000..0fa8142152964be69ab688609928e3b76693caf9
--- /dev/null
+++ b/src/gamePackage.h
@@ -0,0 +1,13 @@
+/*!
+* \file gamePackage.h
+* \brief Fichier contenant les signatures des fonctions liees a la structure gamePackage.
+*/
+
+#ifndef GAME_PACKAGE_H
+#define GAME_PACKAGE_H
+
+Game_Package Construire_Package();
+
+#endif // GAME_PACKAGE_INCLUDED
+
+
diff --git a/src/main.c b/src/main.c
index 50b221dd0ef2e69a05b107be8d40ada2570fbf06..7fc34629258d697d656ae3e8d38f400d0fca4fa7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -8,6 +8,7 @@
#include "roxml.h"
#include "carte.h"
#include "Interface.h"
+#include "gamePackage.h"
/*!
@@ -81,31 +82,6 @@ int init_jeu(char *filename)
return 0;
}
-
-/*!
- * \fn Game_Package Construire_Package()
- * \brief Fonction de construction d'un package contenant l'univers du jeu
- *
- * \return un Game_Package
- */
-Game_Package Construire_Package()
-{
- Game_Package Pack;
-
- Classe* Classes_Pack = Librairie_Classes("../resources/Classes.xml");
- Terrain* Terrains_Pack = Librairie_Terrains("../resources/Terrains.xml");
- Skins_GUI* GUI_Pack = Get_Skins_GUI("../resources/GUI.xml");
- Carte_A* Map_Pack = ExtraireCartesXML("../resources/Maps.xml");
-
- Pack.Classes_Package = Classes_Pack;
- Pack.Terrains_Package = Terrains_Pack;
- Pack.GUI_Package = GUI_Pack;
- Pack.Cartes_Package = Map_Pack;
-
- return Pack;
-}
-
-
int main()
{
diff --git a/src/personnage.h b/src/personnage.h
index 4c654da17142a3ed688219f9e45ac4ac72543526..26e201176fc265159a34b2e65730e399e2bb8ffd 100644
--- a/src/personnage.h
+++ b/src/personnage.h
@@ -1,5 +1,5 @@
/*!
-* \file AffichageConsole.h
+* \file Personnage.h
* \brief Fichier contenant les signatures des fonctions liees a la structure personnage.
*/