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

fixed remaining merge errors, maybe still dont build this yet

Browse source
This commit is contained in:
ElijahZAwesome 2018-02-06 17:22:10 -06:00
parent 1e3fb61d76
commit edecea1055
6 changed files with 26 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/Player.h
View file

@ -91,6 +91,6 @@ PlayerData* getLocalPlayer();
void tickPlayer(PlayerData *pd, bool inmenu);
void playerSetActiveItem(PlayerData *pd, Item * item);
bool playerUseEnergy(PlayerData *pd, int amount);
bool playerUseEnergy(PlayerData * pd, int amount);
void playerHeal(PlayerData *pd, int amount);
void playerSpawn(PlayerData *pd);