diff --git a/Adventures in Lestoria/SettingsWindow.cpp b/Adventures in Lestoria/SettingsWindow.cpp index 291e57c5..5b32e110 100644 --- a/Adventures in Lestoria/SettingsWindow.cpp +++ b/Adventures in Lestoria/SettingsWindow.cpp @@ -46,6 +46,7 @@ All rights reserved. #include "State_OverworldMap.h" #include "MenuLabel.h" #include "Slider.h" +#include "Checkbox.h" INCLUDE_DATA INCLUDE_game @@ -83,8 +84,19 @@ void Menu::InitializeSettingsWindow(){ Menu::menus[SETTINGS]->F(A::LAST_SFX_VOLUME)=val; } })END; + settingsWindow->ADD("Terrain Collision Boxes Checkbox",Checkbox)(geom2d::rect{{windowSize.x/2-88.f,84},{16.f,16.f}},[](ToggleFuncData data){ + return true; + },true)END; + settingsWindow->ADD("Terrain Collision Boxes Label",MenuLabel)(geom2d::rect{{windowSize.x/2-68.f,84},{windowSize.x/2+54.f,16.f}},"Terrain Collision Boxes",1.f,ComponentAttr::SHADOW)END; + settingsWindow->ADD("Keyboard Play Auto-Aim Checkbox",Checkbox)(geom2d::rect{{windowSize.x/2-88.f,104},{16.f,16.f}},[](ToggleFuncData data){ + return true; + },false)END; + settingsWindow->ADD("Keyboard Play Auto-Aim Label",MenuLabel)(geom2d::rect{{windowSize.x/2-68.f,104},{windowSize.x/2+54.f,16.f}},"Keyboard Aim Assist\n (For Keyboard Only Players)",1.f,ComponentAttr::SHADOW)END; + + settingsWindow->ADD("Keyboard Bindings Label",MenuComponent)(geom2d::rect{{28,132.f},vf2d{windowSize.x-32,24}},"Keyboard Bindings",MenuType::ENUM_END,DO_NOTHING,vf2d{1.5f,2.f})END; + settingsWindow->ADD("Controller Bindings Label",MenuComponent)(geom2d::rect{{28,160.f},vf2d{windowSize.x-32,24}},"Controller Bindings",MenuType::ENUM_END,DO_NOTHING,vf2d{1.5f,2.f})END; - settingsWindow->ADD("Go Back",MenuComponent)(geom2d::rect{windowSize/2-vf2d{36,16},{72,12}},"Go Back",[](MenuFuncData data){ + settingsWindow->ADD("Go Back",MenuComponent)(geom2d::rect{vf2d{windowSize.x/2.f,windowSize.y}-vf2d{36,16},{72,12}},"Go Back",[](MenuFuncData data){ Menu::CloseMenu(); return true; })END; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 65dc1afb..872be750 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 6743 +#define VERSION_BUILD 6753 #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 a628440d..09f79be8 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ