nanopenguin/SDL_Minigame
0
0
Fork 0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 13:43:41 +00:00
Code Actions Wiki

code cleanup after peer2peer

Browse Source
This commit is contained in:
Markus 2024-01-29 20:55:50 -06:00
parent 0a1747d651
commit 1dfdc2ed20
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/PopupWindow.h
View File

@ -25,8 +25,6 @@ private:
SDL_Window* window; SDL_Window* window;
SDL_Texture* texture; SDL_Texture* texture;
bool continueGame; bool continueGame;
}; };

5
src/Game.cpp
View File

@ -276,9 +276,8 @@ void Game::refreshPlayers() {
for(auto& p : projectiles) for(auto& p : projectiles)
p->destroy(); p->destroy();
player.getComponent<TransformComponent>().position = Vector2D(80, 80);
player.getComponent<TransformComponent>().position.x = 80; enemy.getComponent<TransformComponent>().position = Vector2D(600, 500);
player.getComponent<TransformComponent>().position.y = 80;
player.getComponent<HealthComponent>().setHealth(5); player.getComponent<HealthComponent>().setHealth(5);
enemy.getComponent<HealthComponent>().setHealth(5); enemy.getComponent<HealthComponent>().setHealth(5);

24
src/PopupWindow.cpp
View File

@ -34,18 +34,23 @@ void PopupWindow::handleWinnerEvents() {
{ {
continueGame = false; continueGame = false;
interacted = true; interacted = true;
return;
} }
else if (e.type == SDL_KEYDOWN)
{ if(e.type != SDL_KEYDOWN)
if (e.key.keysym.sym == SDLK_c) continue;
{
continueGame = true; switch (e.key.keysym.sym) {
interacted = true;
} case SDLK_q: {
else if (e.key.keysym.sym == SDLK_q)
{
continueGame = false; continueGame = false;
interacted = true; interacted = true;
break;
}
case SDLK_c: {
continueGame = true;
interacted = true;
break;
} }
} }
} }
@ -59,6 +64,7 @@ void PopupWindow::renderWinnerPopup(bool winner) {
SDL_RenderClear(this->renderer); SDL_RenderClear(this->renderer);
//Maybe use texture manager (changes need to be made that it does not use game::renderer automatically, but receives one instead)
this->texture = winner ? IMG_LoadTexture(this->renderer, "assets/Player1Victory.png") this->texture = winner ? IMG_LoadTexture(this->renderer, "assets/Player1Victory.png")
: IMG_LoadTexture(this->renderer, "assets/Player2Victory.png"); : IMG_LoadTexture(this->renderer, "assets/Player2Victory.png");

1
src/main.cpp
View File

@ -18,7 +18,6 @@ int main(int argc, char* argv[])
game->init("No_Name_Chicken_Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_SIZE_WIDTH, SCREEN_SIZE_HEIGHT, false); game->init("No_Name_Chicken_Game", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, SCREEN_SIZE_WIDTH, SCREEN_SIZE_HEIGHT, false);
while(playing) { while(playing) {
std::cout << "djslfsldkfj" << std::endl;
while (game->running()) { while (game->running()) {
frameStart = SDL_GetTicks(); frameStart = SDL_GetTicks();