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

3
source/Menu.c
View file

@ -386,7 +386,7 @@ void tickMenu(int menu){
case MENU_ABOUT:
if (localInputs.k_decline.clicked) currentMenu = MENU_TITLE;
break;
/*
case MENU_ARMOR:
if (k_delete.clicked || k_decline.clicked){
currentMenu = MENU_NONE;
@ -405,6 +405,7 @@ void tickMenu(int menu){
if (k_up.clicked){ --curInvSel; if(curInvSel < 0)curInvSel=player.p.inv->lastSlot-1;}
if (k_down.clicked){ ++curInvSel; if(curInvSel > player.p.inv->lastSlot-1)curInvSel=0;}
break;
*/
case MENU_LOADGAME:
if(!enteringName && !areYouSure){ // World select