Game.cpp

@@ -8,15 +8,6 @@
 
 bool keys[4] = {false, false, false, false};
 
-void Game::spawnItem(Type type) {
-    Item item{};
-    item.type = type;
-    item.x = rand() % WINDOW_WIDTH;
-    item.y = rand() % WINDOW_HEIGHT;
-
-    items.push_back(item);
-}
-
 void Opponent::move(int timeMultiplier) {
     if (this->x < this->targetX) this->x += timeMultiplier;
     if (this->x > this->targetX) this->x -= timeMultiplier;
@@ -37,7 +28,7 @@ void Player::moveY(int dy) {
 }
 
 void Game::checkCollision() {
-    for (int i = 0; i < opponents.size(); i++) {
+for (int i = 0; i < opponents.size(); i++) {
         Opponent o = opponents[i];
         if (o.x == o.targetX && o.y == o.targetY) {
             opponents.erase(opponents.begin() + i);
@@ -45,35 +36,16 @@ void Game::checkCollision() {
         if (player.x < o.x + 80 && player.x + 80 > o.x && player.y < o.y + 96 && player.y + 96 > o.y) {
             if (player.health > 0) {
                 player.health--;
-            }
+            } else {
-            else {
                 // TODO: Game over sccreen
             }
 
             opponents.erase(opponents.begin() + i);
         }
     }
-
-    for (int i = 0; i < items.size(); i++) {
-        Item item = items[i];
-        if (player.x < item.x + 24 && player.x + 80 > item.x && player.y < item.y + 24 && player.y + 96 > item.y) {
-            switch (item.type) {
-            case Type::HEALTH:
-                if (player.health < 3) {
-                    player.health++;
-                }
-                break;
-            case Type::DAMAGE:
-                player.health--;
-                break;
-            }
-
-            items.erase(items.begin() + i);
-        }
-    }
 }
 
-void Game::renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const {
+void Game::renderHUD(SDL_Renderer *renderer, SDL_Texture *heart) {
     SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
     SDL_Rect bgRect = {0, 0, 30 * 3 + 15, 40};
     SDL_RenderFillRect(renderer, &bgRect);
@@ -83,7 +55,7 @@ void Game::renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const {
     }
 }
 
-void Game::renderPlayer(SDL_Renderer* renderer, SDL_Texture* playerTexture, Player p) const {
+void Game::renderPlayer(SDL_Renderer *renderer, SDL_Texture *playerTexture, Player p) {
     drawTexture(renderer, playerTexture, p.x, p.y, 80, 96);
 
     if (showHitboxes) {
@@ -93,28 +65,6 @@ void Game::renderPlayer(SDL_Renderer* renderer, SDL_Texture* playerTexture, Play
     }
 }
 
-void Game::renderItem(SDL_Renderer* renderer, Item i) const {
-    SDL_Texture* itemTexture = IMG_LoadTexture(renderer, i.type == Type::HEALTH ? "./res/heart.png" : "./res/damage.png");
-    switch (i.type) {
-    case Type::HEALTH:
-        drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
-        SDL_DestroyTexture(itemTexture);
-        break;
-    case Type::DAMAGE:
-        drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
-        SDL_DestroyTexture(itemTexture);
-
-        break;
-    default: break;
-    }
-
-    if (showHitboxes) {
-        SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
-        SDL_Rect hitbox = {i.x, i.y, 24, 24};
-        SDL_RenderDrawRect(renderer, &hitbox);
-    }
-}
-
 void Game::createOpponent() {
     Opponent o;
 
@@ -149,7 +99,7 @@ void Game::createOpponent() {
     opponents.push_back(o);
 }
 
-void Game::renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture, Opponent o) const {
+void Game::renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o) {
     drawTexture(renderer, opponentTexture, o.x, o.y, 80, 96);
 
     if (showHitboxes) {
@@ -159,29 +109,26 @@ void Game::renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture,
     }
 }
 
-void Game::render(SDL_Renderer* renderer, SDL_Texture* bg) {
+void Game::render(SDL_Renderer *renderer, SDL_Texture *bg) {
     SDL_RenderClear(renderer);
 
     SDL_SetRenderDrawColor(renderer, 35, 39, 42, SDL_ALPHA_OPAQUE);
 
     drawTexture(renderer, bg, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
 
-    SDL_Texture* playerTexture = IMG_LoadTexture(renderer, "./res/player.png");
+    SDL_Texture *playerTexture = IMG_LoadTexture(renderer, "./res/player.png");
     renderPlayer(renderer, playerTexture, this->player);
 
-    SDL_Texture* opponentTexture = IMG_LoadTexture(renderer, "./res/opponent.png");
+    SDL_Texture *opponentTexture = IMG_LoadTexture(renderer, "./res/opponent.png");
-    for (Opponent o : this->opponents) {
+    for (Opponent o: this->opponents) {
         renderOpponent(renderer, opponentTexture, o);
     }
 
-    for (Item i : this->items) {
+    SDL_Texture *heart = IMG_LoadTexture(renderer, "./res/heart.png");
-        renderItem(renderer, i);
-    }
-
-    SDL_Texture* heart = IMG_LoadTexture(renderer, "./res/heart.png");
     renderHUD(renderer, heart);
 
-    TTF_Font* font = TTF_OpenFont("./res/font.ttf", 24);
+    TTF_Init();
+    TTF_Font *font = TTF_OpenFont("./res/font.ttf", 24);
 
     drawText(renderer, font, "h: " + std::to_string(player.health), 30 * 3 + 15 + 10, 10);
 
@@ -193,16 +140,14 @@ void Game::render(SDL_Renderer* renderer, SDL_Texture* bg) {
 }
 
 void Game::run() {
-    SDL_Window* window = SDL_CreateWindow("Obstacle Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+    SDL_Window *window = SDL_CreateWindow("Obstacle Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
                                           WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
-    SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
+    SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
 
-    SDL_Texture* background = IMG_LoadTexture(renderer, "./res/background.png");
+    SDL_Texture *background = IMG_LoadTexture(renderer, "./res/background.png");
 
     int startTime = time(nullptr);
 
-    TTF_Init();
-
     bool gameOpen = true;
     while (gameOpen) {
         SDL_Event event;
@@ -240,12 +185,7 @@ void Game::run() {
 
         if (rand() % 100 == 0) createOpponent();
 
-        if (time(nullptr) - startTime > 5) {
+        for (Opponent &o: opponents) {
-            startTime = time(nullptr);
-            spawnItem(Type::HEALTH);
-        }
-
-        for (Opponent& o : opponents) {
             o.move(10);
         }
 

Game.h

@@ -17,19 +17,8 @@ public:
     void moveY(int dy);
 };
 
-enum class Type {
+class Opponent: public Player {
-    HEALTH,
-    DAMAGE
-};
 
-struct Item {
-    int x;
-    int y;
-
-    Type type;
-};
-
-class Opponent : public Player {
 public:
     int targetX = 0;
     int targetY = 0;
@@ -39,22 +28,18 @@ public:
 class Game {
     Player player;
     std::vector<Opponent> opponents;
-    std::vector<Item> items;
-
     bool showHitboxes = false;
 
-    void renderPlayer(SDL_Renderer* renderer, SDL_Texture* player, Player p) const;
+    void renderPlayer(SDL_Renderer *renderer, SDL_Texture *player, Player p);
-
 public:
-    void spawnItem(Type type);
+
     void createOpponent();
     void checkCollision();
-    void renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const;
+    void renderHUD(SDL_Renderer *renderer, SDL_Texture *heart);
-    void renderItem(SDL_Renderer* renderer, Item i) const;
+    void render(SDL_Renderer *renderer, SDL_Texture *bg);
-    void render(SDL_Renderer* renderer, SDL_Texture* bg);
     void run();
 
-    void renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture, Opponent o) const;
+    void renderOpponent(SDL_Renderer *renderer, SDL_Texture *opponentTexture, Opponent o);
 };