diff --git a/Adventures in Lestoria/MenuType.h b/Adventures in Lestoria/MenuType.h index 32f04aa8..62ef6213 100644 --- a/Adventures in Lestoria/MenuType.h +++ b/Adventures in Lestoria/MenuType.h @@ -63,7 +63,7 @@ enum MenuType{ LOAD_GAME, //100% Controller Compatibility - Online Mode Tab switching USER_ID, //100% Controller Compatibility SETTINGS, //100% Controller Compatibility - SHERMAN, //0% Controller Compatibility + SHERMAN, //100% Controller Compatibility INPUT_KEY_DISPLAY, //25% Controller Compatibility NEW_INPUT, //100% Controller Compatibility PAUSE, //0% Controller Compatibility diff --git a/Adventures in Lestoria/ShermanWindow.cpp b/Adventures in Lestoria/ShermanWindow.cpp index a2960820..9d9aac60 100644 --- a/Adventures in Lestoria/ShermanWindow.cpp +++ b/Adventures in Lestoria/ShermanWindow.cpp @@ -39,6 +39,9 @@ All rights reserved. #include "Menu.h" #include "MenuComponent.h" #include "GameState.h" +#include "AdventuresInLestoria.h" + +INCLUDE_game void Menu::InitializeShermanWindow(){ Menu*shermanWindow=CreateMenu(SHERMAN,CENTERED,vi2d{144,88}); @@ -56,4 +59,27 @@ void Menu::InitializeShermanWindow(){ Menu::CloseMenu(); return true; },vf2d{2.f,2.f},ButtonAttr::FIT_TO_LABEL)END; + + shermanWindow->SetupKeyboardNavigation( + [](MenuType type,Data&returnData){ //On Open + returnData="Leave Button"; + }, + { //Button Key + {game->KEY_SCROLL,{"Navigate",[](MenuType type){}}}, + {game->KEY_BACK,{"Stay",[](MenuType type){ + Menu::CloseMenu(); + }}}, + {game->KEY_CONFIRM,{"Select",[](MenuType type){}}}, + } + ,{ //Button Navigation Rules + {"Leave Button",{ + .up="Stay Button", + .down="Consumable Crafting Button",}}, + {"Consumable Crafting Button",{ + .up="Leave Button", + .down="Stay Button",}}, + {"Stay Button",{ + .up="Consumable Crafting Button", + .down="Leave Button",}}, + }); } \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 3d60e32b..82ec4dac 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 7391 +#define VERSION_BUILD 7393 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 8badfb56..f604c861 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ