diff --git a/Adventures in Lestoria/RowItemDisplay.h b/Adventures in Lestoria/RowItemDisplay.h index 8342241d..c22a6a16 100644 --- a/Adventures in Lestoria/RowItemDisplay.h +++ b/Adventures in Lestoria/RowItemDisplay.h @@ -100,13 +100,16 @@ public: std::string itemName=itemRef.lock()->DisplayName(); vf2d scaledSize={std::min(1.f,(rect.size.x-6-iconSize.x)/game->GetTextSizeProp(itemName).x),1}; - if(!canEnhance&&fadeOutIfMissingRequirements){ - itemName="#666666"+itemName; + bool missingRequirements=!canEnhance&&fadeOutIfMissingRequirements; + + Pixel itemNameTextCol=WHITE; + if(missingRequirements){ + itemNameTextCol=DARK_GREY; } if(locked&&hideLabelWhileLocked)std::for_each(itemName.begin(),itemName.end(),[](char&c){if(c>='0'&&c<='z'){c='?';}}); - window.DrawShadowStringPropDecal(rect.pos+vf2d{4,4}+vf2d{iconSize.x,iconSize.y/2-4},itemName,WHITE,BLACK,scaledSize); + window.DrawShadowStringPropDecal(rect.pos+vf2d{4,4}+vf2d{iconSize.x,iconSize.y/2-4},itemName,itemNameTextCol,BLACK,scaledSize); #pragma endregion if(showQuantity&&itemRef.lock()->Amt()!=INFINITE){ diff --git a/Adventures in Lestoria/TODO.txt b/Adventures in Lestoria/TODO.txt index ea9af8d1..ada871f3 100644 --- a/Adventures in Lestoria/TODO.txt +++ b/Adventures in Lestoria/TODO.txt @@ -8,6 +8,4 @@ Materials for initial craft seems to be wrong? need to recheck do we need a minimap? (maybe with fog of war?) Maybe polling that once testing with more people. should gemstones dropp from boss stages aswell? (Maybe lower droprate?) -Funny text colors with text color override on blacksmith menu - Toggle for displaying error messages \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 269b8a53..696f345b 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 5 #define VERSION_PATCH 1 -#define VERSION_BUILD 8105 +#define VERSION_BUILD 8113 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/olcPixelGameEngine.h b/Adventures in Lestoria/olcPixelGameEngine.h index a3bda95d..f3197d98 100644 --- a/Adventures in Lestoria/olcPixelGameEngine.h +++ b/Adventures in Lestoria/olcPixelGameEngine.h @@ -4594,24 +4594,7 @@ namespace olc { bHasMouseFocus = state; } void PixelGameEngine::olc_UpdateKeyFocus(bool state) - { - bHasInputFocus = state; - - if(!state){ //Drop all key and mouse inputs as we have lost input focus. - // Compare hardware input states from previous frame - auto ScanHardware = [&](HWButton* pKeys, bool* pStateOld, bool* pStateNew, uint32_t nKeyCount) - { - for (uint32_t i = 0; i < nKeyCount; i++) - { - if(pKeys==pKeyboardState)olc_UpdateKeyState(i,false); - else if(pKeys==pMouseState)olc_UpdateMouseState(i,false); - } - }; - - ScanHardware(pKeyboardState, pKeyOldState, pKeyNewState, 256); - ScanHardware(pMouseState, pMouseOldState, pMouseNewState, nMouseButtons); - } - } + { bHasInputFocus = state; } void PixelGameEngine::olc_DropFiles(int32_t x, int32_t y, const std::vector& vFiles) { diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 4373fc67..d557b94a 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ