Mathias/ObstacleGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Update game states

Browse Source
This commit is contained in:
Mathias Wagner
2024-12-02 09:37:49 +01:00
parent cc96b2aa1b
commit 69a957c6f6
5 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/states/InGameState.cpp
View File

@ -33,11 +33,11 @@ void InGameState::checkCollision() {
opponents.erase(opponents.begin() + i);
}
if (player.x < o.x + 80 && player.x + 80 > o.x && player.y < o.y + 96 && player.y + 96 > o.y) {
if (player.health > 0) {
if (player.health > 1) {
player.health--;
}
else {
// TODO: Game over sccreen
this->changeRoom("ending");
}
opponents.erase(opponents.begin() + i);
@ -50,6 +50,7 @@ void InGameState::checkCollision() {
switch (item.type) {
case Type::HEALTH:
if (player.health < 3) {
items.erase(items.begin() + i);
player.health++;
}
break;
@ -58,7 +59,6 @@ void InGameState::checkCollision() {
break;
}
items.erase(items.begin() + i);
}
}
}
@ -141,6 +141,8 @@ void InGameState::renderHUD(SDL_Renderer* renderer, SDL_Texture* heart) const {
}
void InGameState::init() {
std::cout << "Game state initialized\n";
SDL_ShowCursor(SDL_ENABLE);
startTime = time(nullptr);
}
@ -190,16 +192,17 @@ void InGameState::update() {
}
for (Opponent& o : opponents) {
o.move(10);
o.move(3);
}
if (keys[0]) player.moveY(-20);
if (keys[1]) player.moveX(-20);
if (keys[2]) player.moveY(20);
if (keys[3]) player.moveX(20);
int speed = 10;
if (keys[0]) player.moveY(speed * -1);
if (keys[1]) player.moveX(speed * -1);
if (keys[2]) player.moveY(speed);
if (keys[3]) player.moveX(speed);
}
void InGameState::render(SDL_Renderer* renderer) {
void InGameState::render(SDL_Renderer* renderer, double deltaTime) {
SDL_RenderClear(renderer);
SDL_SetRenderDrawColor(renderer, 35, 39, 42, SDL_ALPHA_OPAQUE);
@ -207,6 +210,10 @@ void InGameState::render(SDL_Renderer* renderer) {
SDL_Texture* background = IMG_LoadTexture(renderer, "./res/background.png");
drawTexture(renderer, background, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
for (Item i : this->items) {
renderItem(renderer, i);
}
SDL_Texture* playerTexture = IMG_LoadTexture(renderer, "./res/player.png");
renderPlayer(renderer, playerTexture, this->player);
@ -215,10 +222,6 @@ void InGameState::render(SDL_Renderer* renderer) {
renderOpponent(renderer, opponentTexture, o);
}
for (Item i : this->items) {
renderItem(renderer, i);
}
SDL_Texture* heart = IMG_LoadTexture(renderer, "./res/heart.png");
renderHUD(renderer, heart);