initialize the items (aka objects) of the teams

Signed-off-by: Olivier Gayot <duskcoder@gmail.com>

3 files changed, 15 insertions, 16 deletions

diff --git a/jouer.c b/jouer.c
index 8603df7..bbe246d 100644
--- a/jouer.c
+++ b/jouer.c
@@ -237,7 +237,6 @@ int Fjouer (SURFACES *surfaces, POSITIONS *positions, struct team_t *ally, struc
         surfaces->Pfondjeu=NULL;
     }
     Fblitterfond(surfaces); // on blit le fond du jeu
-    Fremplirobjets(&ally->objects); // on monte les variables potions ether, etc
 
     /* compute whether the allies or the enemies should begin */
     Vtour = rand() % 2;
@@ -332,11 +331,3 @@ int Fjouer (SURFACES *surfaces, POSITIONS *positions, struct team_t *ally, struc
     }
     return 0;
 }
-
-void Fremplirobjets(OBJET *objets)
-{
-    objets->potions=10;
-    objets->ethers=10;
-    objets->potionsplus=5;
-    objets->ethersplus=5;
-}
diff --git a/menuchoixpersos.c b/menuchoixpersos.c
index e2d5cfc..0ce0360 100644
--- a/menuchoixpersos.c
+++ b/menuchoixpersos.c
@@ -72,6 +72,17 @@ static void init_team_players(struct team_t *team, bool left,
     }
 }
 
+static void init_team(struct team_t *team, int chr_cnt)
+{
+    team->objects.potions = 10;
+    team->objects.ethers = 10;
+    team->objects.potionsplus = 5;
+    team->objects.ethersplus = 5;
+
+    team->chr_cnt = chr_cnt;
+    team->chr_cur = rand() % team->chr_cnt;
+    team->chrs = malloc(sizeof(struct character_t) * team->chr_cnt);
+}
 
 static
 struct team_t *new_ally_team(SURFACES *surfaces,
@@ -81,9 +92,8 @@ struct team_t *new_ally_team(SURFACES *surfaces,
 
     team->name = "Team Player";
     team->cpu = false;
-    team->chr_cnt = cnt;
-    team->chr_cur = rand() % team->chr_cnt;
-    team->chrs = malloc(sizeof(struct character_t) * team->chr_cnt);
+
+    init_team(team, cnt);
 
     init_team_players(team, true, classes, surfaces);
 
@@ -126,9 +136,8 @@ struct team_t *new_enemy_team(SURFACES *surfaces, const struct team_t *ally_team
 
     team->name = "Team CPU";
     team->cpu = true;
-    team->chr_cnt = rand() % 5 + 1;
-    team->chr_cur = rand() % team->chr_cnt;
-    team->chrs = malloc(sizeof(struct character_t) * team->chr_cnt);
+
+    init_team(team, rand() % 5 + 1);
 
     classes = malloc(sizeof(enum character_class_t) * team->chr_cnt);
 
diff --git a/prototypes.h b/prototypes.h
index ffa1c94..582bfee 100644
--- a/prototypes.h
+++ b/prototypes.h
@@ -37,7 +37,6 @@ void blit_character_affinities(SURFACES *, POSITIONS *, const struct character_t
 void update_list_entries(SURFACES *surfaces, POSITIONS *positions, const struct entry_t *entries, int cnt, int selected);
 void Fblitterpvcible (SURFACES *surfaces,POSITIONS *positions, const struct character_t *);
 void Fblitterpmcible (SURFACES *surfaces,POSITIONS *positions, const struct character_t *);
-void Fremplirobjets(OBJET *objets);
 void Fblitterfond(SURFACES* surfaces);
 
 Uint32 obtenirPixel(SDL_Surface *surface, int x, int y);