Złączono i wszystko działa, ale trzeba zrobić mocny refactor Planszy bo za dużo niewiadomo skąd biorących się pętli

headers/Actor.h

@@ -26,16 +26,11 @@ public:
     virtual void moveDown() = 0;
     virtual void shoot() = 0;
 
-    std::vector<Bullet>& getBullets();
-    sf::Sprite& getSprite();
-    Position getPosition();
     void updateBullets();
     void setMovingSpeed(float speed);
     void dealDamage();
     void healUP();
 
-    void updateBullets();
-
 protected:
     Position position;
     sf::Sprite actorSprite;
@@ -44,7 +39,6 @@ protected:
     sf::Texture rocketTexture;
     std::vector<Bullet> bullets;
     sf::Clock damageDealClock;
-    Position position;
     int hp;
     unsigned int damage;
     unsigned int firerate;

headers/Plansza.h

@@ -39,30 +39,14 @@ public:
         delete ship; // usuwanie wskaźnika ship
     }
 private:
-    sf::RenderWindow *window;
     Background background;
     AudioManager audioManager;
     Player *ship;
+    Size size;
     sf::RenderWindow *window;
     sf::Font font;
-    Size size;
-    sf::Texture meteorTexture1;
-    sf::Texture meteorTexture2;
-    sf::Texture heartTexture;
-    sf::Texture heartTextureGray;
     sf::Clock meteorSpawnClock;
     sf::Clock heartSpawnClock;
-    sf::Texture enemyBulletTexture;
-    sf::Texture WiazkaTexture;
-    sf::Texture BombaTexture;
-    sf::Texture playerTexture;
-    sf::Texture playerBulletTexture;
-    sf::Texture playerRocketTexture;
-    sf::Texture enemyTexture;
-    sf::Texture advancedEnemyTexture;
-    sf::Texture BomberEnemyTexture;
-    sf::Texture KamikadzeTexture;
-    sf::Texture WiazkowiecTexture;
     sf::Clock spawnClock;
     sf::Clock scoreClock;
     sf::Clock shooterSpawnClock;
@@ -71,6 +55,21 @@ private:
     sf::Clock BomberSpawnClock;
     sf::Clock KamikadzeSpawnClock;
     sf::Clock WiazkowiecSpawnClock;
+    sf::Texture playerTexture;
+    sf::Texture playerBulletTexture;
+    sf::Texture playerRocketTexture;
+    sf::Texture enemyTexture;
+    sf::Texture enemyBulletTexture;
+    sf::Texture advancedEnemyTexture;
+    sf::Texture BomberEnemyTexture;
+    sf::Texture BombaTexture;
+    sf::Texture KamikadzeTexture;
+    sf::Texture WiazkowiecTexture;
+    sf::Texture WiazkaTexture;
+    sf::Texture meteorTexture1;
+    sf::Texture meteorTexture2;
+    sf::Texture heartTexture;
+    sf::Texture heartTextureGray;
     std::vector<Enemy> enemies;
     std::vector<AdvancedEnemy> AEnemies;
     std::vector<Bomber> BEnemies;
@@ -81,7 +80,6 @@ private:
     std::vector<sf::Sprite> heartStats;
     bool gameOver = false;
     unsigned int score = 0;
-    bool isPlayerSpawned = false;
 };
 
 #endif //PLANSZA_H

headers/Player.h

@@ -29,9 +29,7 @@ public:
     void moveUp() override;
     void moveDown() override;
     void takeDamage();
-    bool isAlive() const;
+
-    void update();
-    void onHit();
     void update();
     std::vector<Rocket>& getRockets();
 
@@ -42,11 +40,8 @@ private:
     std::vector<Rocket> rockets;
     sf::Texture rocketTexture;
     sf::Texture bulletTexture;
-    bool isBlinking = false;
     sf::Color originalColor;
-
     sf::Clock immortalityClock;       // Zegar kontrolujący czas nieśmiertelności
-    int health = 3; // Liczba punktów życia gracza
     float immortalityDuration = 1.5f; // Czas trwania nieśmiertelności w sec
     bool isImmortal = false;           // flaga na immortal
 };

sources/Plansza.cpp

@@ -59,7 +59,7 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
     spawnClock.restart();
 }
 
-
+// TODO: Refactor tej metody bo rozrosła się za bardzo już
 void Plansza::update() {
 // tło
     background.update();
@@ -136,18 +136,18 @@ void Plansza::update() {
     update_hearts();
     ship->updateBullets();
 
-    ship.update();
+    ship->update();
     window->draw(ship->getSprite());
 
     for (auto &meteor: meteors) {
         if (ship->getSprite().getGlobalBounds().intersects(meteor.getSprite().getGlobalBounds())) {
-            ship.onHit();
+            ship->takeDamage();
         }
     }
 
     for (auto heartIt = hearts.begin(); heartIt != hearts.end();) {
-        if (ship.getSprite().getGlobalBounds().intersects(heartIt->getSprite().getGlobalBounds())) {
+        if (ship->getSprite().getGlobalBounds().intersects(heartIt->getSprite().getGlobalBounds())) {
-            ship.healUP();
+            ship->healUP();
             heartIt = hearts.erase(heartIt);
         } else {
             ++heartIt;
@@ -156,9 +156,9 @@ void Plansza::update() {
 
     for (auto meteorIt = getMeteors().begin(); meteorIt != getMeteors().end();) {
         bool meteorHit = false;
-        for (auto rocketIt = ship.getBullets().begin(); rocketIt != ship.getBullets().end();) {
+        for (auto rocketIt = ship->getBullets().begin(); rocketIt != ship->getBullets().end();) {
             if (meteorIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
-                ship.getBullets().erase(rocketIt);
+                ship->getBullets().erase(rocketIt);
                 meteorIt = getMeteors().erase(meteorIt);
                 meteorHit = true;
                 break;
@@ -173,9 +173,9 @@ void Plansza::update() {
 
     for (auto meteorIt = getMeteors().begin(); meteorIt != getMeteors().end();) {
         bool meteorHit = false;
-        for (auto rocketIt = ship.getRockets().begin(); rocketIt != ship.getRockets().end();) {
+        for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
             if (meteorIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
-                ship.getRockets().erase(rocketIt);
+                ship->getRockets().erase(rocketIt);
                 meteorIt = getMeteors().erase(meteorIt);
                 meteorHit = true;
                 break;
@@ -189,13 +189,7 @@ void Plansza::update() {
     }
 
 
-    // Warunek przeganej
     if (gameOver) {
-            ship->takeDamage();
-        }
-    }
-
-    if (!ship->isAlive()) {
         sf::RenderWindow errorWindow(sf::VideoMode(350, 200), "The end");
         sf::Font font;
         if (!font.loadFromFile("../assets/fonts/arial.ttf")) {
@@ -662,7 +656,7 @@ void Plansza::update() {
 
 
     // Statystyka życia gracza (wyświetlanie)
-    switch (ship.getHP()) {
+    switch (ship->getHP()) {
         case 0:
             heartStats[0].setTexture(heartTextureGray);
             heartStats[1].setTexture(heartTextureGray);

sources/Player.cpp

@@ -8,7 +8,7 @@
 #include <SFML/Graphics/Text.hpp>
 
 Player::Player(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) {
-
+    hp = 3;
 }
 
 Player* Player::getInstance(int x, int y, const sf::Texture& texture) {
@@ -21,7 +21,6 @@ Player* Player::getInstance(int x, int y, const sf::Texture& texture) {
 void Player::loadTexture() {
     bulletTexture.loadFromFile("../assets/img/bullets/bullet_pink.png");
     rocketTexture.loadFromFile("../assets/img/rockets/Rocket_111.png");
-    hp = 3;
     damageDealClock.restart();
     originalColor = actorSprite.getColor();
 }
@@ -64,43 +63,10 @@ void Player::update() {
 
 void Player::takeDamage() {
     if (!isImmortal) {
-        if (health > 0) {
+        if (hp > 0) {
-            health--;
+            hp--;
-            std::cout << "Player hit! Remaining health: " << health << "\n";
             isImmortal = true;           // Aktywuj chwilową nieśmiertelność
             immortalityClock.restart();
-
-
-            if (health <= 0) {
-                std::cout << "Player has been destroyed!\n";
-                std::cout << "You lost the game!\n";
-
-            }
-        }
-    }
-}
-
-bool Player::isAlive() const {
-    return health > 0;
-}
-
-void Player::onHit() {
-    dealDamage();
-    isBlinking = true;
-}
-
-void Player::update() {
-    if (isBlinking) {
-        auto elapsed = damageDealClock.getElapsedTime().asMilliseconds();
-        if (elapsed < 1000) { // miganie przez 1 sekundę
-            if ((elapsed / 100) % 2 == 0) {
-                actorSprite.setColor(sf::Color(255, 255, 255, 128)); // półprzeźroczysty
-            } else {
-                actorSprite.setColor(originalColor); // oryginalny kolor
-            }
-        } else {
-            isBlinking = false;
-            actorSprite.setColor(originalColor); // przywróć oryginalny kolor
         }
     }
 }