diff --git a/code/constant.h b/code/constant.h index 4d29b9119211df899dc3c5d17d09ee3af2f3a89b..90b908d3e4bf200f1cfd69c679571cab11f5e271 100644 --- a/code/constant.h +++ b/code/constant.h @@ -57,12 +57,27 @@ /** * \brief Hauteur de l'ennemie du type 4 */ -#define ENEMY_T4_HEIGHT 68 +#define ENEMY_T4_HEIGHT 65 /** * \brief Largeur de l'ennemie du type 4 */ -#define ENEMY_T4_WIDTH 58 +#define ENEMY_T4_WIDTH 54 + + +/** + * \brief Hauteur de l'ennemie du type 1 + */ +#define ENEMY_T1_HEIGHT 86 + +/** + * \brief Largeur de l'ennemie du type 1 + */ +#define ENEMY_T1_WIDTH 71 + + + + /** * \brief Taille de l'avion de ravitaillement diff --git a/code/display.c b/code/display.c index 79f924d32733ea94a9c79b806b49aa4196fee933..09a8ac589c14244a88e352e863b3ab865ea17d6c 100644 --- a/code/display.c +++ b/code/display.c @@ -127,11 +127,6 @@ void refresh_graphics(SDL_Renderer *renderer, world_t *world,resources_t *resour load_texture_powerUp(resources, renderer, world); } - if(world->gameover == 1) - { - destroy_textures(resources,world); - } - apply_text(renderer, 5 , 5 , 100 , 25 ,"Manche :", resources->font); apply_text(renderer, 5 , 30 , 100 , 25 ,"HP :", resources->font); apply_text(renderer, 5 , 55 , 100 , 25 ,"Ammo :", resources->font); @@ -220,7 +215,7 @@ void init_ressources(SDL_Renderer *renderer, resources_t *resources, world_t *wo void init_enemies_ressources(SDL_Renderer *renderer, resources_t *resources, world_t *world) { - resources->enemies = (SDL_Texture**) calloc(world->rounds.number_enemies,sizeof(SDL_Texture*)); + resources->enemies = (SDL_Texture**) malloc(world->rounds.number_enemies*sizeof(SDL_Texture*)); for (int i = 0; i < world->rounds.number_enemies; i++) { if(world->rounds.enemies[i].type == 1 || world->rounds.enemies[i].type == 4) @@ -249,7 +244,7 @@ void init_enemies_ressources(SDL_Renderer *renderer, resources_t *resources, wor void realloc_enemies_ressources(SDL_Renderer *renderer, resources_t *resources, world_t *world) { - SDL_Texture* *tab = (SDL_Texture**) calloc(world->rounds.number_enemies,sizeof(SDL_Texture*)); + SDL_Texture* *tab = (SDL_Texture**) malloc(world->rounds.number_enemies*sizeof(SDL_Texture*)); free(resources->enemies); //resources->enemies = NULL; resources->enemies = tab; diff --git a/code/enemy.c b/code/enemy.c index 99652f1241998754ee0e1699c9aad4bf50634a92..8fc7f0ea37bfcf1f5705233fad9e539d94d67a44 100644 --- a/code/enemy.c +++ b/code/enemy.c @@ -42,12 +42,12 @@ void init_enemyType1(enemy_t *enemy) int random = rand()%2+0; if (random == 1) { - init_sprite(&enemy->sprite, SCREEN_WIDTH+75, SCREEN_HEIGHT-ENEMY_HEIGHT*2-20, ENEMY_WIDTH, ENEMY_HEIGHT, ENEMY_SPEED, 1); + init_sprite(&enemy->sprite, SCREEN_WIDTH+75, SCREEN_HEIGHT-ENEMY_T1_HEIGHT*2-20, ENEMY_T1_WIDTH, ENEMY_T1_HEIGHT, ENEMY_SPEED, 1); enemy->direction = -1; /*enemy->isLookingRight = 1; enemy->isLookingLeft = 0;*/ }else{ - init_sprite(&enemy->sprite, -75, SCREEN_HEIGHT-ENEMY_HEIGHT*2-20, ENEMY_WIDTH, ENEMY_HEIGHT, ENEMY_SPEED, 1); + init_sprite(&enemy->sprite, -75, SCREEN_HEIGHT-ENEMY_T1_HEIGHT*2-20, ENEMY_T1_WIDTH, ENEMY_T1_HEIGHT, ENEMY_SPEED, 1); enemy->direction = 1; /*enemy->isLookingRight = 1; enemy->isLookingLeft = 0;*/ @@ -55,8 +55,8 @@ void init_enemyType1(enemy_t *enemy) enemy->type = 1; enemy->DestEnemy.x = enemy->sprite.x; enemy->DestEnemy.y = enemy->sprite.y; - enemy->DestEnemy.w = ENEMY_WIDTH; - enemy->DestEnemy.h = ENEMY_HEIGHT; + enemy->DestEnemy.w = ENEMY_T1_WIDTH; + enemy->DestEnemy.h = ENEMY_T1_HEIGHT; } void init_enemyType2(enemy_t *enemy) diff --git a/code/main.c b/code/main.c index 9fc561c906eeffe04f15f274e47084bc84e9e2f0..5a3f1fd8384eaaa9c38617fe5c7e7fc79a24abd5 100644 --- a/code/main.c +++ b/code/main.c @@ -82,7 +82,7 @@ int main(void) SDL_RenderPresent(renderer); } // Quitter SDL - //destroy_textures(&resources,&world); + destroy_textures(&resources,&world); SDL_DestroyRenderer(renderer); SDL_DestroyWindow(window); SDL_Quit(); diff --git a/code/round_management.c b/code/round_management.c index 9be99ea96c4314db23f26f9d258fb6dabc3b3b5f..640a813c4e780abe1a353a1cffa73c664c31bac6 100644 --- a/code/round_management.c +++ b/code/round_management.c @@ -24,7 +24,7 @@ void initFirstRound(round_t *round, int nbEnemies, int incrementation) round->index_to_spawn = 0; round->is_new_round = 0; //round->gameFinished = 0; - round->enemies = (enemy_t*) calloc(round->number_enemies,sizeof(enemy_t)); + round->enemies = (enemy_t*) malloc(round->number_enemies*sizeof(enemy_t)); for (int i = 0; i < round->number_enemies; i++) { init_enemy(&round->enemies[i]); @@ -44,7 +44,7 @@ void updateRound(round_t *round) } } round->counter++; - if(round->counter == 500) + if(round->counter == 50) { round->counter = 0; } @@ -77,7 +77,7 @@ void createEnemies(round_t *round) { //round->enemies = (enemy_t*) realloc(round->enemies,sizeof(enemy_t)*round->number_enemies); - enemy_t *tab = (enemy_t*) calloc(round->number_enemies,sizeof(enemy_t)); + enemy_t *tab = (enemy_t*) malloc(round->number_enemies*sizeof(enemy_t)); free(round->enemies); //round->enemies = NULL; round->enemies = tab;