diff --git a/Makefile b/Makefile index fa154b9..6d6edbe 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,6 @@ ifeq ($(strip $(ICON)),) ifneq (,$(findstring $(TARGET).png,$(icons))) export APP_ICON := $(TOPDIR)/$(TARGET).png else - ifneq (,$(findstring icons-banners/icon.png,$(icons))) ifneq (,$(findstring /icons-banners/icon.png,$(icons))) export APP_ICON := $(TOPDIR)/icons-banners/icon.png endif diff --git a/source/Globals.c b/source/Globals.c index f855a6d..ff69593 100644 --- a/source/Globals.c +++ b/source/Globals.c @@ -2273,7 +2273,6 @@ void tickPlayer(){ } if(isSwimming()) ++player.p.swimTimer; - if(regening) ++player.p.regenTimer; if(UnderStrengthEffect) ++player.p.strengthTimer; if(player.p.strengthTimer >= 2000) { player.p.strengthTimer = 0; @@ -2284,6 +2283,11 @@ void tickPlayer(){ player.p.speedTimer = 0; UnderSpeedEffect = false; } + if(regening) ++player.p.regenTimer; + if(player.p.regenTimer >= 2000) { + player.p.regenTimer = 0; + regening = false; + } if(player.p.attackTimer > 0) { --player.p.attackTimer; }