Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

changed makefile

Browse source
This commit is contained in:
ElijahZAwesome 2018-01-22 17:09:17 -06:00
parent 960982e4ab
commit 5e06ba05c7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -109,7 +109,6 @@ ifeq ($(strip $(ICON)),)
ifneq (,$(findstring $(TARGET).png,$(icons))) ifneq (,$(findstring $(TARGET).png,$(icons)))
export APP_ICON := $(TOPDIR)/$(TARGET).png export APP_ICON := $(TOPDIR)/$(TARGET).png
else else
ifneq (,$(findstring icons-banners/icon.png,$(icons)))
ifneq (,$(findstring /icons-banners/icon.png,$(icons))) ifneq (,$(findstring /icons-banners/icon.png,$(icons)))
export APP_ICON := $(TOPDIR)/icons-banners/icon.png export APP_ICON := $(TOPDIR)/icons-banners/icon.png
endif endif

6
source/Globals.c
View file

@ -2273,7 +2273,6 @@ void tickPlayer(){
} }
if(isSwimming()) ++player.p.swimTimer; if(isSwimming()) ++player.p.swimTimer;
if(regening) ++player.p.regenTimer;
if(UnderStrengthEffect) ++player.p.strengthTimer; if(UnderStrengthEffect) ++player.p.strengthTimer;
if(player.p.strengthTimer >= 2000) { if(player.p.strengthTimer >= 2000) {
player.p.strengthTimer = 0; player.p.strengthTimer = 0;
@ -2284,6 +2283,11 @@ void tickPlayer(){
player.p.speedTimer = 0; player.p.speedTimer = 0;
UnderSpeedEffect = false; UnderSpeedEffect = false;
} }
if(regening) ++player.p.regenTimer;
if(player.p.regenTimer >= 2000) {
player.p.regenTimer = 0;
regening = false;
}
if(player.p.attackTimer > 0) { if(player.p.attackTimer > 0) {
--player.p.attackTimer; --player.p.attackTimer;
} }