Skip to content
Snippets Groups Projects
Commit f815e34e authored by Lenny Siol's avatar Lenny Siol
Browse files

Update: Game class, enemy now gets destroyed when hit.

parent 582fd59e
No related branches found
No related tags found
1 merge request!12Feature: Scoring system
......@@ -20,13 +20,13 @@
<vector>
"../Enemy/Enemy.h"
1614815755 source:/home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Game/Game.cpp
1614817284 source:/home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Game/Game.cpp
"Game.h"
"../Entities/Ship/Ship.h"
"../Entities/Missile/Missile.h"
"../Entities/Enemy/Enemy.h"
1614815755 /home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Game/Game.h
1614817304 /home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Game/Game.h
"SDL2/SDL.h"
"SDL2/SDL_image.h"
<iostream>
......@@ -59,7 +59,7 @@
1614801356 /home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Entities/Missile/Missile.h
"../Entity.h"
1614813058 source:/home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Entities/Enemy/Enemy.cpp
1614816724 source:/home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Entities/Enemy/Enemy.cpp
"Enemy.h"
1614813058 /home/lenny/Desktop/Boxelware/Code/Space-Shooter_Game/src/Entities/Enemy/Enemy.h
......
......@@ -79,12 +79,14 @@ void Ship::collisionDetection()
SDL_Rect result;
SDL_Rect A = missiles[i]->destionation;
for(Enemy *e : game->getEnemies())
for(int j = 0; j < game->getEnemies().size(); j++)
{
SDL_Rect B = e->destionation;
SDL_Rect B = game->getEnemies()[j]->destionation;
if(SDL_IntersectRect(&A,&B,&result))
{
std::cout<<"Enemy hit"<<std::endl;
game->killEnemy(j);
missiles.erase(missiles.begin() + i);
}
}
}
......
......@@ -179,3 +179,8 @@ void Game::endGame()
std::cout<<"End Game"<<std::endl;
}
void Game::killEnemy(int index)
{
enemies.erase(enemies.begin() + index);
}
......@@ -31,6 +31,7 @@ class Game
int getHeight();
std::vector <Enemy*> getEnemies();
void killEnemy(int index);
void endGame();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment