Merge remote-tracking branch 'origin/serduszka'

# Conflicts:
#	CMakeLists.txt
#	headers/Actor.h
#	headers/Plansza.h
#	headers/Player.h
#	sources/Plansza.cpp
#	sources/Player.cpp

headers/Plansza.h

@@ -14,6 +14,7 @@
 #include "Background.h"
 #include "AudioManager.h"
 #include "Plansza.h"
+#include "Heart.hpp"
 #include "Size.h"
 
 class Plansza {
@@ -22,7 +23,9 @@ public:
     Size getSize();
     std::vector<Meteor> &getMeteors();
     void spawn_meteor();
+    void spawn_hearts();
     void update_meteors();
+    void update_hearts();
     void update();
     void update_score();
     void setOutOfBounds(bool status);
@@ -36,14 +39,19 @@ public:
         delete ship; // usuwanie wskaźnika ship
     }
 private:
-    Size size;
+    sf::RenderWindow *window;
     Background background;
     AudioManager audioManager;
     Player *ship;
     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;
@@ -69,6 +77,9 @@ private:
     std::vector<Kamikadze> KEnemies;
     std::vector<Wiazkowiec> WEnemies;
     std::vector<Meteor> meteors;
+    std::vector<Heart> hearts;
+    std::vector<sf::Sprite> heartStats;
+    bool gameOver = false;
     unsigned int score = 0;
     bool isPlayerSpawned = false;
 };