diff --git a/Adventures in Lestoria/Error.h b/Adventures in Lestoria/Error.h index 0b99b072..c3047633 100644 --- a/Adventures in Lestoria/Error.h +++ b/Adventures in Lestoria/Error.h @@ -97,7 +97,7 @@ inline std::ofstream debugLogger; class Error{ public: inline static void log(std::stringstream&str,std::source_location loc){ - std::cout<SetLEDColor(steamControllers[i],col.r,col.g,col.b,0); } ) +} + +const int InputGroup::GetKeyCodeSum()const{ + return std::accumulate(keys.begin(),keys.end(),0,[](int val,const Input&input){return val+int(input.GetType())*1000+input.GetKeyCode();}); } \ No newline at end of file diff --git a/Adventures in Lestoria/Key.h b/Adventures in Lestoria/Key.h index 978f15b3..fdb7d2aa 100644 --- a/Adventures in Lestoria/Key.h +++ b/Adventures in Lestoria/Key.h @@ -179,12 +179,14 @@ public: const float Analog()const; const float AnalogDAS(const float threshold=0.2f); void ClearAllKeybinds(); + const int GetKeyCodeSum()const; std::string GetDisplayName(); //Draws an input display with accompanying text centered at given position. void DrawPrimaryInput(const std::variantrenderer,const vf2d pos,const std::string_view displayText,const uint8_t alpha)const; void DrawPrimaryInput(const std::variantrenderer,const vf2d pos,const std::string_view displayText,const uint8_t alpha,const InputType type,vf2d textScale={1.f,1.f})const; void DrawInput(const std::variantrenderer,const vf2d pos,const std::string_view displayText,const uint8_t alpha,const InputType type,vf2d textScale={1.f,1.f},const std::string_view preDisplayText="")const; const std::optionalGetPrimaryKey(InputType type)const; + friend const bool operator<(const InputGroup&group1,const InputGroup&group2); }; class InputEngageGroup{ @@ -208,6 +210,7 @@ public: InputGroup&GetGroup()const; const InputEngageGroup operator=(const InputEngageGroup&rhs); const bool GetLabelVisible()const; + friend const bool operator<(const InputEngageGroup&group1,const InputEngageGroup&group2); }; class GenericKey{ @@ -226,7 +229,5 @@ public: static void Update(); }; -const bool operator<(const InputGroup&group1,const InputGroup&group2); -const bool operator<(const InputEngageGroup&group1,const InputEngageGroup&group2); using enum InputEngageGroup::EngageType; \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 83c45445..21c89221 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 3 -#define VERSION_BUILD 9660 +#define VERSION_BUILD 9665 #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 6061bcdc..9cb873e5 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ