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

Update states

Browse Source
This commit is contained in:
Mathias Wagner 2024-11-25 22:30:59 +01:00
parent 03aadf4163
commit 824dd9e1f2
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/states/InGameState.cpp
View File

@ -9,6 +9,10 @@ void InGameState::spawnItem(Type type) {
item.x = rand() % WINDOW_WIDTH;
item.y = rand() % WINDOW_HEIGHT;
for (const Item i : items) {
if (i.type == type) return;
}
items.push_back(item);
}
@ -60,7 +64,8 @@ void InGameState::checkCollision() {
}
void InGameState::renderItem(SDL_Renderer* renderer, Item i) const {
SDL_Texture* itemTexture = IMG_LoadTexture(renderer, i.type == Type::HEALTH ? "./res/heart.png" : "./res/damage.png");
SDL_Texture* itemTexture = IMG_LoadTexture(
renderer, i.type == Type::HEALTH ? "./res/heart.png" : "./res/damage.png");
switch (i.type) {
case Type::HEALTH:
drawTexture(renderer, itemTexture, i.x, i.y, 24, 24);
@ -175,14 +180,13 @@ void InGameState::handleEvents(SDL_Event& event) {
}
void InGameState::update() {
checkCollision();
if (rand() % 100 == 0) createOpponent();
if (time(nullptr) - startTime > 5) {
startTime = time(nullptr);
spawnItem(Type::HEALTH);
startTime = time(nullptr);
spawnItem(Type::HEALTH);
}
for (Opponent& o : opponents) {
@ -218,10 +222,6 @@ void InGameState::render(SDL_Renderer* renderer) {
SDL_Texture* heart = IMG_LoadTexture(renderer, "./res/heart.png");
renderHUD(renderer, heart);
TTF_Font* font = TTF_OpenFont("./res/font.ttf", 24);
drawText(renderer, font, "h: " + std::to_string(player.health), 30 * 3 + 15 + 10, 10);
SDL_DestroyTexture(playerTexture);
SDL_DestroyTexture(opponentTexture);
SDL_DestroyTexture(heart);

17
src/states/MainMenuState.cpp
View File

@ -1,5 +1,8 @@
#include "MainMenuState.h"
#include <iostream>
#include <SDL_image.h>
#include "../Renderer.h"
void MainMenuState::update() {
// Handle updates like animations if necessary
@ -14,7 +17,6 @@ void MainMenuState::handleEvents(SDL_Event& event) {
switch (event.key.keysym.sym) {
case SDLK_RETURN:
std::cout << "Switching to game state\n";
this->changeRoom("game");
break;
case SDLK_ESCAPE:
std::cout << "Exiting game\n";
@ -24,11 +26,24 @@ void MainMenuState::handleEvents(SDL_Event& event) {
break;
}
}
if (event.type == SDL_MOUSEBUTTONDOWN) {
this->changeRoom("game");
}
if (event.type == SDL_MOUSEMOTION) {
std::cout << "Mouse moved\n";
}
}
void MainMenuState::render(SDL_Renderer* renderer) {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
SDL_RenderClear(renderer);
SDL_Texture* title = IMG_LoadTexture(renderer, "./res/logo.png");
drawTexture(renderer, title, WINDOW_WIDTH/2-75, 100, 150, 150);
SDL_RenderPresent(renderer);
}