diff --git a/Bomber.cpp b/Bomber.cpp index 80505783c0ede2e1cab1b9b5533be742605c75b1..b937b627a08231aa4d9dcc596c0284afe1aec4b7 100644 --- a/Bomber.cpp +++ b/Bomber.cpp @@ -1,5 +1,5 @@ #include "Bomber.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- Bomber::Bomber(float x, float y, enum direction dir, int animationstep) : Enemy(5,x,y,dir,animationstep) diff --git a/Bomber.hpp b/Bomber.hpp index c24ac0d59713ae0e21e6b8cb9794fe4737cc8fa2..0dc30c0ef38ae32d1f4a62b5c115553c49549c7b 100644 --- a/Bomber.hpp +++ b/Bomber.hpp @@ -2,7 +2,7 @@ #define BOMBER_HPP #include "Enemy.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- class Level; diff --git a/Enemy.cpp b/Enemy.cpp index d38049f75c7c99f129e78d7b2861fca2ca749371..2d1e500ac3ef94e931261947c007e7150f22105e 100644 --- a/Enemy.cpp +++ b/Enemy.cpp @@ -1,7 +1,7 @@ #include "Enemy.hpp" #include "Level.hpp" #include "Enemyprojectile.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- Enemy::Enemy(int health,float x, float y, enum direction dir, int animationstep) { diff --git a/Enemy.hpp b/Enemy.hpp index a2c6d36938dcc971887bad0c051d52ada7460e29..cc08cd032415cc5ca90b6c69edd0439337f4d2e5 100644 --- a/Enemy.hpp +++ b/Enemy.hpp @@ -4,7 +4,7 @@ #include "Entity.hpp" #include "PixelBuffer.hpp" #include "Platform.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- class Level; diff --git a/Enemyprojectile.cpp b/Enemyprojectile.cpp index f4d9dcbf60921eed8970e463081e297c1536cb60..4d876b476ad2fbd6199ad02e3ed371b7cda498fb 100644 --- a/Enemyprojectile.cpp +++ b/Enemyprojectile.cpp @@ -1,7 +1,7 @@ #include "Enemyprojectile.hpp" #include "Platform.hpp" #include "Level.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direction--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direction--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- EnemyProjectile::EnemyProjectile(float x, float y, enum direction dir) : Projectile(x,y,dir) diff --git a/Enemyprojectile.hpp b/Enemyprojectile.hpp index 78971c7ae6a2ee1007f4f6aa3f7419d81f7a5326..aacb8b23f56a62440a387839a9be3b905eb36029 100644 --- a/Enemyprojectile.hpp +++ b/Enemyprojectile.hpp @@ -1,7 +1,7 @@ #ifndef ENEMYPROJECTILE_HPP #define ENEMYPROJECTILE_HPP #include "Projectile.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- Color constexpr ENEMY_PROJECTILE_COLOR = _2; class EnemyProjectile: public Projectile diff --git a/Tank.cpp b/Tank.cpp index 731b7a10816017668ba3e95fac2433236144541e..e00098c1f5d426cbd1d7f7a6b483e9b0f91f5a7c 100644 --- a/Tank.cpp +++ b/Tank.cpp @@ -1,5 +1,5 @@ #include "Tank.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direction--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direction--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- Tank::Tank(float x, float y, enum direction dir, int animationstep) : Enemy(3,x,y,dir,animationstep) diff --git a/Tank.hpp b/Tank.hpp index 48e95d2cbd36e5629c30cb3f6e7b2c3d21c869db..d9566aaa56c29a91e9f2d6394922165f5d78b64a 100644 --- a/Tank.hpp +++ b/Tank.hpp @@ -2,7 +2,7 @@ #define TANK_HPP #include "Enemy.hpp" #include "Level.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- class Tank: public Enemy // Fight the Power! { diff --git a/Trooper.cpp b/Trooper.cpp index 0fef0d0115934cff9f71b6bedb4c48924652f1aa..1079b65627d2714f48565fdb0d440de02132aea2 100644 --- a/Trooper.cpp +++ b/Trooper.cpp @@ -1,6 +1,6 @@ #include "Level.hpp" #include "Trooper.hpp" -//WeberMa73121: implementation enum direction dir ersetzt int direction--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direction--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- Trooper::Trooper(float x, float y, enum direction dir, int animationstep) diff --git a/Trooper.hpp b/Trooper.hpp index 3300cd50c0246b66e1ea6f7fb5fcc94ec6c288ed..cbac4caf09908d47f5e0bd0d53eca3cc989fbff8 100644 --- a/Trooper.hpp +++ b/Trooper.hpp @@ -1,6 +1,6 @@ #ifndef TROOPER_HPP #define TROOPER_HPP -//WeberMa73121: implementation enum direction dir ersetzt int direcion--------------------------------------- +//WeberMa73121: implementation enum direction dir replaces int direcion--------------------------------------- //Hauerch71498 ---------------------------------------------------------------------------------------------- #include "Enemy.hpp" class Level; diff --git a/main.cpp b/main.cpp index 57edc66762bf87b2cb9a467b45deb387d44e701c..8cae4c847a4dfc636015c27f29c20c6ab62ca363 100644 --- a/main.cpp +++ b/main.cpp @@ -259,6 +259,7 @@ public: framebuffer.blit_topleft(i.ScorePos,i.getScoreSprite()); } } + //weberma73121 framebuffer.blit_topleft({ 3, 3 },player_.getLivesSprite()); // kruegerzo72182> // <hoffmanncl72341 diff --git a/player.cpp b/player.cpp index 9fde6abbc5afe3dc73f7e8eb243e9fad21fc45d7..2b5d5a640016e26051df3f0ecafc158589e28cfb 100644 --- a/player.cpp +++ b/player.cpp @@ -130,10 +130,11 @@ Player::Shader::Shader(Player const &player) : PixelBuffer(PLAYER_W, (PLAYER_H + 2)), player(player) { } - +//hoffmanncl72341---------------------------- Color Player::Shader::peekUnchecked(PixelPoint const &pos) const { auto const &basesprite = [this]() { + //hoffmanncl72341---------------------------- switch (player.dir) { case direction::BACK: return back[player.animationstep]; @@ -148,6 +149,7 @@ Color Player::Shader::peekUnchecked(PixelPoint const &pos) const default: return front[player.animationstep]; } + //hoffmanncl72341----------------------------- }(); if(player.timetillreload == 0.0f) { return basesprite.peek(pos); @@ -162,6 +164,7 @@ Color Player::Shader::peekUnchecked(PixelPoint const &pos) const } return basesprite.peek(pos); } +//hoffmanncl72341--------------------------- PixelBuffer const& Player::getSprite() {