From 4a4f1ecb0eb5a5e880c7441fba8b797e0a9c592d Mon Sep 17 00:00:00 2001 From: Andre Schweiger Date: Sun, 4 Feb 2018 22:34:00 +0100 Subject: [PATCH] Small Fixes --- data/player.png | Bin 3986 -> 4506 bytes source/Globals.c | 1 + source/IngameMenu.c | 5 +++++ source/Player.c | 2 ++ source/Player.h | 2 +- 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/data/player.png b/data/player.png index 4c6edafab319710a81fcca7df183a8a3c892a1d1..d2ced95aed4a47bf1cfd8f2bf556a866aaef5c71 100644 GIT binary patch literal 4506 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, e->x, e->y); e->p.endTimer = 60; e->p.isDead = true; + e->hurtTime = 10; return; } break; diff --git a/source/IngameMenu.c b/source/IngameMenu.c index 6003e54..d8159f6 100644 --- a/source/IngameMenu.c +++ b/source/IngameMenu.c @@ -96,15 +96,19 @@ void ingameMenuTick(PlayerData *pd, int menu) { case MENU_WIN: if (pd->inputs.k_accept.clicked){ pd->ingameMenu = MENU_NONE; + pd->entity.p.hasWon = false; } break; case MENU_LOSE: if (pd->inputs.k_accept.clicked){ pd->ingameMenu = MENU_NONE; + pd->entity.p.isDead = false; + pd->entity.p.health = 10; pd->entity.level = 1; playerSpawn(pd); //TODO: This canceled to main menu, but what should I do in multiplayer? } + pd->entity.hurtTime = 10; break; case MENU_CONTAINER: @@ -186,6 +190,7 @@ void ingameMenuTick(PlayerData *pd, int menu) { wrap = wrap - 1; pd->entity.p.health = 10; + pd->entity.hurtTime = 10; //head if(pd->ingameMenuSelection==0) { diff --git a/source/Player.c b/source/Player.c index 5085699..7cffb80 100644 --- a/source/Player.c +++ b/source/Player.c @@ -352,6 +352,8 @@ bool playerUse(PlayerData *pd) { } void tickPlayer(PlayerData *pd, bool inmenu) { + if (pd->entity.p.isDead) return; + //invincibility time if (pd->entity.hurtTime > 0) pd->entity.hurtTime--; diff --git a/source/Player.h b/source/Player.h index db05f1d..45e3563 100644 --- a/source/Player.h +++ b/source/Player.h @@ -12,7 +12,7 @@ #define PLAYER_SPRITE_EYES_COUNT 5 #define PLAYER_SPRITE_BODY_COUNT 6 #define PLAYER_SPRITE_ARMS_COUNT 6 -#define PLAYER_SPRITE_LEGS_COUNT 4 +#define PLAYER_SPRITE_LEGS_COUNT 5 typedef struct _plrsp {