Merge branch 'BossV1'
# Conflicts: # CMakeLists.txt # headers/Plansza.h # sources/Plansza.cpp
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "PowerUp.h"
|
||||
#include "Debuff.h"
|
||||
#include "Size.h"
|
||||
#include "Boss.h"
|
||||
|
||||
enum ships{
|
||||
nova,
|
||||
@@ -53,16 +54,17 @@ public:
|
||||
void spawn_enemy();
|
||||
void spawn_advanced_enemy();
|
||||
void spawn_wiazkowiec();
|
||||
void spawn_boss();
|
||||
void spawn_bomber();
|
||||
void spawn_kamikadze();
|
||||
~Plansza() {
|
||||
delete ship; // usuwanie wskaźnika ship
|
||||
delete ship;
|
||||
delete boss;
|
||||
}
|
||||
|
||||
static ships selectedShip;
|
||||
static unsigned int score;
|
||||
sf::Font font;
|
||||
|
||||
private:
|
||||
Background background;
|
||||
AudioManager audioManager;
|
||||
@@ -100,6 +102,7 @@ private:
|
||||
sf::Texture advancedEnemyTexture;
|
||||
sf::Texture BomberEnemyTexture;
|
||||
sf::Texture BombaTexture;
|
||||
sf::Texture BossTexture;
|
||||
sf::Texture KamikadzeTexture;
|
||||
sf::Texture WiazkowiecTexture;
|
||||
sf::Texture WiazkaTexture;
|
||||
@@ -127,7 +130,13 @@ private:
|
||||
std::vector<Debuff> debuffs;
|
||||
|
||||
// Zmienne prymitywne
|
||||
Boss* boss = nullptr; // Wskaźnik na bossa
|
||||
sf::Clock bossSpawnClock; // Zegar do spawnowania bossa
|
||||
unsigned int nextBossScoreThreshold = 1; // Próg punktowy dla spawnu bossa
|
||||
bool bossSpawned = false; // Flaga informująca, czy boss został już zespawnowany
|
||||
bool gameOver = false;
|
||||
|
||||
// Używane do powerup i debuff flagi
|
||||
struct {
|
||||
bool movingSpeed = false;
|
||||
bool firerate = false;
|
||||
|
||||
Reference in New Issue
Block a user