move to entity and add player

4 files changed, 40 insertions, 33 deletions

diff --git a/src/entity.cpp b/src/entity.cpp
new file mode 100644
index 0000000..af93f36
--- /dev/null
+++ b/src/entity.cpp
@@ -0,0 +1,16 @@
+#include "enemy.hpp"
+
+Entity::Entity(void)
+{
+    posX = GetRandomValue(0, SCREENWIDTH);
+    posY = GetRandomValue(0, SCREENHEIGHT);
+    if (static_cast<int>(posX) & 1)
+    {
+        direction = (Vector2){posX / 100, -posY / 100};
+    } else {
+        direction = (Vector2){-posX / 100, posY / 100};
+    }
+
+}
+
+Entity::~Entity() {}
diff --git a/src/entity.hpp b/src/entity.hpp
new file mode 100644
index 0000000..49d98b6
--- /dev/null
+++ b/src/entity.hpp
@@ -0,0 +1,15 @@
+#ifndef ENEMY_H_
+#define ENEMY_H_
+
+#include "window.hpp"
+
+class Entity {
+    public:
+        float posX;
+        float posY;
+        Vector2 direction;
+        Entity();
+        ~Entity();
+};
+
+#endif // ENEMY_H_
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 56429d9..260ddde 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -3,27 +3,18 @@
 #include <iostream>
 
 
-Enemy::Enemy(void)
+Game::~Game()
 {
-    posX = GetRandomValue(0, SCREENWIDTH);
-    posY = GetRandomValue(0, SCREENHEIGHT);
-    if (static_cast<int>(posX) & 1)
-    {
-        direction = (Vector2){posX / 100, -posY / 100};
-    } else {
-        direction = (Vector2){-posX / 100, posY / 100};
-    }
-
+    delete enemies;
+    delete player;
 }
 
-Enemy::~Enemy() {}
-Game::~Game() {}
-
 Game::Game(void)
 {
     nEnemies = GetRandomValue(5, 15);
 
-    enemies = new std::vector<Enemy>(nEnemies);
+    enemies = new std::vector<Entity>(nEnemies);
+    player = new Entity;
 }
 
 void Game::start() const
diff --git a/src/gameplay.hpp b/src/gameplay.hpp
index 3dc6b27..151b591 100644
--- a/src/gameplay.hpp
+++ b/src/gameplay.hpp
@@ -2,31 +2,16 @@
 #define GAMEPLAY_H_
 
 #include "window.hpp"
+#include "entity.hpp"
 
 #include <vector>
 
-class Enemy {
-    public:
-        float posX;
-        float posY;
-        Vector2 direction;
-        Enemy();
-        ~Enemy();
-};
-
-class Player {
-    public:
-        float posX;
-        float posY;
-        Vector2 direction;
-        Player();
-        ~Player();
-};
-
 class Game {
     int nEnemies;
 
-    std::vector<Enemy> * enemies;
+    std::vector<Entity> * enemies;
+
+    Entity * player;
 
     public:
         Game();