From 66a4217e1884cf51ef115f86de25258d967b48b3 Mon Sep 17 00:00:00 2001 From: Claudio Hoffmann <hoffmanncl72341@th-nuernberg.de> Date: Tue, 19 Jan 2021 18:47:45 +0100 Subject: [PATCH] Final east const! --- Bomber.cpp | 2 +- Enemy.cpp | 2 +- Enemyprojectile.cpp | 6 +++--- Level.cpp | 4 ++-- Level.hpp | 4 ++-- Scoreb.cpp | 4 ++-- Tank.cpp | 2 +- Trooper.cpp | 4 ++-- player.cpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Bomber.cpp b/Bomber.cpp index b937b62..c168164 100644 --- a/Bomber.cpp +++ b/Bomber.cpp @@ -118,7 +118,7 @@ static StaticPixelBuffer<23,11> constexpr left[2] = { }}} }; -const PixelBuffer& Bomber::getSprite() +PixelBuffer const& Bomber::getSprite() { switch (dir) { diff --git a/Enemy.cpp b/Enemy.cpp index 2d1e500..42f9e6e 100644 --- a/Enemy.cpp +++ b/Enemy.cpp @@ -13,7 +13,7 @@ Enemy::Enemy(int health,float x, float y, enum direction dir, int animationstep) void Enemy::shoot(Level &level) { - const auto &sprite = this->getSprite(); + auto const &sprite = this->getSprite(); if(timetillreload<0) { switch ( this->dir ) { diff --git a/Enemyprojectile.cpp b/Enemyprojectile.cpp index 4d876b4..b8c8989 100644 --- a/Enemyprojectile.cpp +++ b/Enemyprojectile.cpp @@ -13,14 +13,14 @@ static StaticPixelBuffer<3,3> constexpr Psprite= { {"222"}, {" 2 "} }}}; -const PixelBuffer& EnemyProjectile::getSprite() +PixelBuffer const& EnemyProjectile::getSprite() { return Psprite; }; bool EnemyProjectile::move(FloatSeconds const & Frametime, Level &level) { int speed = 15; - const auto &sprite = this->getSprite(); + auto const &sprite = this->getSprite(); switch (this->dir) { case direction::BACK: //down @@ -97,7 +97,7 @@ bool EnemyProjectile::move(FloatSeconds const & Frametime, Level &level) return true; }; -bool EnemyProjectile::doStep(const FloatSeconds &Frametime, Level &level) +bool EnemyProjectile::doStep(FloatSeconds const &Frametime, Level &level) { return move(Frametime,level); }; diff --git a/Level.cpp b/Level.cpp index 04cf7c4..74232bb 100644 --- a/Level.cpp +++ b/Level.cpp @@ -117,7 +117,7 @@ void Level::fillTrooperSpawner(float posX, float posY, unsigned int nmbrEnemies) // <hauerch71498 ---------------------------------------------------------------------- /**Enemy Addprojectile**/ -void Level::addEnemyProjectile(const EnemyProjectile& projectile) +void Level::addEnemyProjectile(EnemyProjectile const& projectile) { projectileVector.push_back(std::make_unique<EnemyProjectile>(projectile)); }; @@ -125,7 +125,7 @@ void Level::addEnemyProjectile(const EnemyProjectile& projectile) // <weberma73121 ---------------------------------------------------------------------- /**Player Addprojectile**/ -void Level::addPlayerProjectile(const PlayerProjectile& projectile) +void Level::addPlayerProjectile(PlayerProjectile const& projectile) { projectileVector.push_back(std::make_unique<PlayerProjectile>(projectile)); }; diff --git a/Level.hpp b/Level.hpp index ce77365..bd2666f 100644 --- a/Level.hpp +++ b/Level.hpp @@ -121,8 +121,8 @@ class Level { public: Level(int width, int heigth, Player &player); - void addEnemyProjectile(const EnemyProjectile & projectile); - void addPlayerProjectile(const PlayerProjectile& projectile); + void addEnemyProjectile(EnemyProjectile const& projectile); + void addPlayerProjectile(PlayerProjectile const& projectile); void addWall(int length, int thickness, Position const &topleft, Orientation orientation); void addScenery(Position const &topleft, SceneryType type); void addEnemy(std::unique_ptr<Enemy> enemy_); diff --git a/Scoreb.cpp b/Scoreb.cpp index 3ee7eee..fb8df60 100644 --- a/Scoreb.cpp +++ b/Scoreb.cpp @@ -133,7 +133,7 @@ static StaticPixelBuffer<4,6> constexpr null= { {"AAA0"}, {" 000"}, }}}; -const PixelBuffer& Score::getGameOverSprite() +PixelBuffer const& Score::getGameOverSprite() { return gameover; } @@ -148,7 +148,7 @@ void Score::SetScoreSprite(int Score) } }; -const PixelBuffer& ScoreB::getScoreSprite() +PixelBuffer const& ScoreB::getScoreSprite() { switch ( number ) { diff --git a/Tank.cpp b/Tank.cpp index e00098c..362553b 100644 --- a/Tank.cpp +++ b/Tank.cpp @@ -126,7 +126,7 @@ static StaticPixelBuffer<17,11> constexpr left[2] = { {" 101010101010101 "} }}} }; -const PixelBuffer& Tank::getSprite() +PixelBuffer const& Tank::getSprite() { switch (dir) { diff --git a/Trooper.cpp b/Trooper.cpp index 1079b65..299ed5b 100644 --- a/Trooper.cpp +++ b/Trooper.cpp @@ -109,7 +109,7 @@ static StaticPixelBuffer<5,9> constexpr right[2] = { {"1 11 "} }}} }; -const PixelBuffer& Trooper::getSprite() +PixelBuffer const& Trooper::getSprite() { switch (dir) { @@ -141,7 +141,7 @@ void Trooper::changeDirection() bool Trooper::checkmove(FloatSeconds const & Frametime, Level &level) { - const auto &sprite = this->getSprite(); + auto const &sprite = this->getSprite(); switch (this->dir) { case direction::BACK: //down diff --git a/player.cpp b/player.cpp index 7b4dd89..e142ba6 100644 --- a/player.cpp +++ b/player.cpp @@ -302,7 +302,7 @@ static StaticPixelBuffer<39,7> constexpr lives[6]={ }}} }; -const PixelBuffer& Player::getLivesSprite() +PixelBuffer const& Player::getLivesSprite() { return lives[hitpoints]; } -- GitLab