Fix items spawning at unreachable positions

src/states/EndingState.cpp

@@ -3,9 +3,12 @@
 #include <iostream>
 #include <SDL_image.h>
 
+int score = 0;
+
 void EndingState::init() {
     SDL_ShowCursor(SDL_ENABLE);
     std::cout << "Ending state initialized\n";
+    score = SDL_GetTicks() / 100;
 }
 
 void EndingState::handleEvents(SDL_Event& event) {
@@ -33,5 +36,8 @@ void EndingState::render(SDL_Renderer* renderer, double deltaTime) {
     drawText(renderer, font, "GAME OVER",
              WINDOW_WIDTH / 2 - 100, WINDOW_HEIGHT / 2 - 50, {255, 0, 0, SDL_ALPHA_OPAQUE});
 
+    drawText(renderer, font, "Score: " + std::to_string(score),
+             WINDOW_WIDTH / 2 - 120, WINDOW_HEIGHT / 2, {255, 255, 255, SDL_ALPHA_OPAQUE});
+
     SDL_RenderPresent(renderer);
 }

src/states/InGameState.cpp

@@ -3,12 +3,29 @@
 
 bool keys[4] = {false, false, false, false};
 
+SDL_Rect InGameState::getPlayerHitbox(const Player& player) const {
+    return {player.x + 20, player.y + 20, 40, 56};
+}
+
+SDL_Rect InGameState::getItemHitbox(const Item& item) const {
+    return {item.x, item.y, 24, 24};
+}
+
+SDL_Rect InGameState::getOpponentHitbox(const Opponent& opponent) const {
+    return {opponent.x, opponent.y, 80, 96};
+}
+
 void InGameState::spawnItem(Type type) {
     Item item{};
     item.type = type;
     item.x = rand() % WINDOW_WIDTH;
     item.y = rand() % WINDOW_HEIGHT;
 
+    if (item.x < 24) item.x += 24;
+    if (item.x > WINDOW_WIDTH - 24) item.x -= 24;
+    if (item.y < 24) item.y += 24;
+    if (item.y > WINDOW_HEIGHT - 24) item.y -= 24;
+
     for (const Item i : items) {
         if (i.type == type) return;
     }
@@ -21,67 +38,63 @@ void InGameState::renderPlayer(SDL_Renderer* renderer, SDL_Texture* playerTextur
 
     if (showHitboxes) {
         SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
-        SDL_Rect hitbox = {p.x, p.y, 80, 96};
+        SDL_Rect hitbox = getPlayerHitbox(p);
         SDL_RenderDrawRect(renderer, &hitbox);
     }
 }
 
+
+
 void InGameState::checkCollision() {
     for (int i = 0; i < opponents.size(); i++) {
         Opponent o = opponents[i];
+        SDL_Rect opponentHitbox = getOpponentHitbox(o);
+        SDL_Rect playerHitbox = getPlayerHitbox(player);
+
         if (o.x == o.targetX && o.y == o.targetY) {
             opponents.erase(opponents.begin() + i);
-        }
-        if (player.x < o.x + 80 && player.x + 80 > o.x && player.y < o.y + 96 && player.y + 96 > o.y) {
+        } else if (SDL_HasIntersection(&playerHitbox, &opponentHitbox)) {
             if (player.health > 1) {
                 player.health--;
-            }
-            else {
+            } else {
                 this->changeRoom("ending");
             }
-
             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) {
-                    items.erase(items.begin() + i);
-                    player.health++;
-                }
-                break;
-            case Type::DAMAGE:
-                player.health--;
-                break;
-            }
+        SDL_Rect itemHitbox = getItemHitbox(item);
+        SDL_Rect playerHitbox = getPlayerHitbox(player);
 
+        if (SDL_HasIntersection(&playerHitbox, &itemHitbox)) {
+            switch (item.type) {
+                case Type::HEALTH:
+                    if (player.health < 3) {
+                        player.health++;
+                        items.erase(items.begin() + i);
+                    }
+                    break;
+                case Type::DAMAGE:
+                    player.health--;
+                    items.erase(items.begin() + i);
+                    break;
+            }
         }
     }
 }
 
+
 void InGameState::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;
-    }
+            renderer, i.type == Type::HEALTH ? "./res/heart.png" : "./res/damage.png");
+    drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
+    SDL_DestroyTexture(itemTexture);
 
     if (showHitboxes) {
         SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
-        SDL_Rect hitbox = {i.x, i.y, 24, 24};
+        SDL_Rect hitbox = getItemHitbox(i);
         SDL_RenderDrawRect(renderer, &hitbox);
     }
 }
@@ -125,7 +138,7 @@ void InGameState::renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTe
 
     if (showHitboxes) {
         SDL_SetRenderDrawColor(renderer, 255, 0, 0, SDL_ALPHA_OPAQUE);
-        SDL_Rect hitbox = {o.x, o.y, 80, 96};
+        SDL_Rect hitbox = getOpponentHitbox(o);
         SDL_RenderDrawRect(renderer, &hitbox);
     }
 }
@@ -138,6 +151,23 @@ void InGameState::renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const {
     for (int i = 0; i < this->player.health; i++) {
         drawTexture(renderer, heart, 10 + i * 30, 10, 24, 24);
     }
+
+    TTF_Font *font = TTF_OpenFont("./res/font.ttf", 24);
+    int score = SDL_GetTicks() / 100;
+
+    int marginL = 90;
+    if (score > 9) marginL = 70;
+    if (score > 99) marginL = 50;
+    if (score > 999) marginL = 20;
+    if (score > 9999) marginL = 0;
+
+    SDL_Rect highRect = {WINDOW_WIDTH - 120 + marginL - 10, 0, 120, 40};
+    SDL_RenderFillRect(renderer, &highRect);
+
+
+    drawText(renderer, font, std::to_string(score),WINDOW_WIDTH - 120 + marginL, 10,
+             {255, 255, 255, SDL_ALPHA_OPAQUE});
+    TTF_CloseFont(font);
 }
 
 void InGameState::init() {

src/states/InGameState.h

@@ -34,6 +34,10 @@ public:
     void update() override;
     void render(SDL_Renderer* renderer, double deltaTime) override;
 
+    SDL_Rect getPlayerHitbox(const Player &player) const;
+    SDL_Rect getOpponentHitbox(const Opponent& o) const;
+    SDL_Rect getItemHitbox(const Item& i) const;
+
     void spawnItem(Type type);
     void createOpponent();
     void checkCollision();
@@ -41,6 +45,7 @@ public:
     void renderItem(SDL_Renderer* renderer, Item i) const;
     void renderOpponent(SDL_Renderer* renderer, SDL_Texture* opponentTexture, Opponent o) const;
 
+
 };
 
 #endif