From 2871c50f73e86f59938da4a5b934cf4eae883a56 Mon Sep 17 00:00:00 2001 From: Milang Date: Sat, 1 Feb 2020 14:36:34 +0100 Subject: [PATCH] move init ennemi function --- include/ennemi.h | 2 ++ include/level.h | 1 + src/ennemi.c | 19 +++++++++++++++++++ src/level.c | 15 --------------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/include/ennemi.h b/include/ennemi.h index aceb69a..ba700aa 100644 --- a/include/ennemi.h +++ b/include/ennemi.h @@ -44,4 +44,6 @@ void display_ennemi_table(); void move_ennemi(ennemi_t *e); +void init_ennemi(ennemi_t * table, int s); + #endif \ No newline at end of file diff --git a/include/level.h b/include/level.h index 177b75e..b1ea253 100644 --- a/include/level.h +++ b/include/level.h @@ -3,5 +3,6 @@ void set_level(int w, int l); void get_lvl_id(int w, int l, char * str); +void malloc_error(); #endif \ No newline at end of file diff --git a/src/ennemi.c b/src/ennemi.c index afed298..6a2cf7e 100644 --- a/src/ennemi.c +++ b/src/ennemi.c @@ -373,3 +373,22 @@ void display_ennemi_table() display_ennemi(&ennemis_global[i]); } } + + +void init_ennemi(ennemi_t * table, int s) +{ + ennemis_global_size=s; + if (ennemis_global) + { + free(ennemis_global); + ennemis_global=0; + } + if (0==ennemis_global_size) + return; + int size=sizeof(ennemi_t)*ennemis_global_size; + ennemis_global=malloc(size); + if (ennemis_global==0) + malloc_error(); + + memcpy(ennemis_global, table, size); +} \ No newline at end of file diff --git a/src/level.c b/src/level.c index a19a907..db8935b 100644 --- a/src/level.c +++ b/src/level.c @@ -52,21 +52,6 @@ static void init_level(int w, int h, int x, int y, cell_t const * a) memcpy(map_current->data, a, sizeof(cell_t)*w*h); } -void init_ennemies(ennemi_t * table) -{ - if (ennemis_global) - { - free(ennemis_global); - } - if (0==ennemis_global_size) - return; - int size=sizeof(ennemi_t)*ennemis_global_size; - ennemis_global=malloc(size); - if (ennemis_global==0) - malloc_error(); - - memcpy(ennemis_global, table, size); -} static void init_plateformes(plateforme_t * table) {