s473616/grafika_komputerowa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hearts #20

Merged
s464983 merged 3 commits from hearts into master 2024-02-08 05:10:34 +01:00
Conversation 0 Commits 3 Files Changed 12 +7 -1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit abf896ce6d - Show all commits

5
grk/project/Nitro.h
View File

@ -11,6 +11,7 @@ public:
glm::mat4 modelMatrix; glm::mat4 modelMatrix;
glm::mat4 initialModelMatrix; glm::mat4 initialModelMatrix;
float healAmount = 10; float healAmount = 10;
bool isCollected;
Nitro(glm::mat4 initialModelMatrix, float healAmount) Nitro(glm::mat4 initialModelMatrix, float healAmount)
@ -18,14 +19,16 @@ public:
modelMatrix(initialModelMatrix), modelMatrix(initialModelMatrix),
initialModelMatrix(initialModelMatrix), initialModelMatrix(initialModelMatrix),
healAmount(healAmount), healAmount(healAmount),
isCollected(false),
GameEntity(1, 1, 0) GameEntity(1, 1, 0)
{} {}
virtual ~Nitro() = default; virtual ~Nitro() = default;
virtual bool isAlive() const { virtual bool isAlive() {
if (this->currentHP <= 0) { if (this->currentHP <= 0) {
isCollected = true;
return false; return false;
} }
return true; return true;

3
grk/project/Spaceship.h
View File

@ -399,4 +399,7 @@ public:
this->currentHP = this->currentHP + 3.f; this->currentHP = this->currentHP + 3.f;
} }
void turboBoost() {
this->turbo = this->turboMAX;
}
}; };