hamx/LotoStatek
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor

Browse Source
This commit is contained in:
Andrii Solianyk
2024-12-19 16:01:21 +01:00
parent 36984b859f
commit 76203a8b29
14 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sources/Plansza.cpp
View File

@@ -140,7 +140,7 @@ void Plansza::update() {
window->draw(rocket.getSprite());
}
// Sprawdzenie czy meteory i pociski są poza granicami ekranu
// Sprawdzenie, czy meteory i pociski są poza granicami ekranu
update_meteors();
update_hearts();
ship->updateBullets();
@@ -406,7 +406,7 @@ void Plansza::update() {
if (playerBulletIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
// Usuń pocisk Bombera i pocisk gracza
it = bomberEnemy.getBullets().erase(it);
playerBulletIt = ship->getBullets().erase(playerBulletIt);
ship->getBullets().erase(playerBulletIt);
bulletDestroyed = true;
break;
} else {
@@ -420,7 +420,7 @@ void Plansza::update() {
if (rocketIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
// Usuń pocisk Bombera i rakietę gracza
it = bomberEnemy.getBullets().erase(it);
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
bulletDestroyed = true;
break;
} else {
@@ -474,7 +474,7 @@ void Plansza::update() {
bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (enemyIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt);
ship->getBullets().erase(bulletIt);
enemyIt->takeDamage();
hit = true;
break;
@@ -493,7 +493,7 @@ void Plansza::update() {
bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (advancedIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt);
ship->getBullets().erase(bulletIt);
advancedIt->takeDamage();
hit = true;
break;
@@ -512,7 +512,7 @@ void Plansza::update() {
bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt);
ship->getBullets().erase(bulletIt);
bomberIt->takeDamage();
hit = true;
break;
@@ -531,7 +531,7 @@ void Plansza::update() {
bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (kamikadzeIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt);
ship->getBullets().erase(bulletIt);
kamikadzeIt->takeDamage();
hit = true;
break;
@@ -550,7 +550,7 @@ void Plansza::update() {
bool hit = false;
for (auto bulletIt = ship->getBullets().begin(); bulletIt != ship->getBullets().end();) {
if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship->getBullets().erase(bulletIt);
ship->getBullets().erase(bulletIt);
wiazkowiecIt->takeDamage();
hit = true;
break;
@@ -572,7 +572,7 @@ void Plansza::update() {
bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (enemyIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
enemyIt->takeDamage();
hit = true;
break;
@@ -591,7 +591,7 @@ void Plansza::update() {
bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (advancedIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
advancedIt->takeDamage();
hit = true;
break;
@@ -610,7 +610,7 @@ void Plansza::update() {
bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
bomberIt->takeDamage();
hit = true;
break;
@@ -629,7 +629,7 @@ void Plansza::update() {
bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (kamikadzeIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
kamikadzeIt->takeDamage();
hit = true;
break;
@@ -648,7 +648,7 @@ void Plansza::update() {
bool hit = false;
for (auto rocketIt = ship->getRockets().begin(); rocketIt != ship->getRockets().end();) {
if (wiazkowiecIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship->getRockets().erase(rocketIt);
ship->getRockets().erase(rocketIt);
wiazkowiecIt->takeDamage();
hit = true;
break;
@@ -687,6 +687,8 @@ void Plansza::update() {
heartStats[1].setTexture(heartTexture);
heartStats[2].setTexture(heartTexture);
break;
default:
break;
}
@@ -698,7 +700,7 @@ void Plansza::update() {
void Plansza::update_meteors() {
// usuwanie meteorów które wyleciały poza ekran
// usuwanie meteorów, które wyleciały poza ekran
for (auto &meteor: meteors) {
if (meteor.getStatus()) {
meteors.erase(meteors.begin());
@@ -787,7 +789,7 @@ void Plansza::spawn_wiazkowiec() {
void Plansza::update_hearts() {
// usuwanie serduszek które wyleciały poza ekran
// usuwanie serduszek, które wyleciały poza ekran
for (auto& heart : hearts) {
if(heart.getStatus()) {
hearts.erase(hearts.begin());