diff --git a/Adventures in Lestoria/Checkbox.h b/Adventures in Lestoria/Checkbox.h index 58207e33..ec436a03 100644 --- a/Adventures in Lestoria/Checkbox.h +++ b/Adventures in Lestoria/Checkbox.h @@ -80,7 +80,9 @@ public: MenuComponent::DrawDecal(window,focused); if(checked){ - window.DrawDecal(rect.pos,GFX["checkmark.png"].Decal()); + const vf2d scale{GetSize()/GFX["checkmark.png"].Sprite()->Size()}; + LOG(std::format("{} / {} / {}",GFX["checkmark.png"].Sprite()->Size().str(),GetSize().str(),scale.str())); + window.DrawDecal(rect.pos,GFX["checkmark.png"].Decal(),scale); } } }; \ No newline at end of file diff --git a/Adventures in Lestoria/Pixel.cpp b/Adventures in Lestoria/Pixel.cpp index e921487f..24a75763 100644 --- a/Adventures in Lestoria/Pixel.cpp +++ b/Adventures in Lestoria/Pixel.cpp @@ -50,6 +50,7 @@ Community: https://community.onelonecoder.com #include "Pixel.h" #include +#include namespace olc{ // O------------------------------------------------------------------------------O diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 7cd48ef2..83c45445 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 9659 +#define VERSION_BUILD 9660 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/emscripten_build.ps1 b/emscripten_build.ps1 index f05cdbc6..c2c18e80 100755 --- a/emscripten_build.ps1 +++ b/emscripten_build.ps1 @@ -1,23 +1,7 @@ git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp" clear -rm -R bin mkdir bin -mkdir bin/assets $ErrorActionPreference = "Stop" -cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html -cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets -cp -R "Adventures in Lestoria/assets/config" bin/assets -cp -R "Adventures in Lestoria/assets/maps" bin/assets -cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets -rm -R bin/assets/backgrounds/commercial_assets -rm -R bin/assets/maps/commercial_assets -cp -R "Adventures in Lestoria/assets/monsters" bin/assets -cp -R "Adventures in Lestoria/assets/music" bin/assets -cp -R "Adventures in Lestoria/assets/npcs" bin/assets -cp -R "Adventures in Lestoria/assets/sounds" bin/assets -cp -R "Adventures in Lestoria/assets/themes" bin/assets -cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets -cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets emcmake cmake -DCMAKE_BUILD_TYPE=Release . cmake --build . -j 20 \ No newline at end of file diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index ec763e46..6061bcdc 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ diff --git a/x64/Release/steam_appid.txt b/x64/Release/steam_appid.txt deleted file mode 100644 index 4a41ffc0..00000000 --- a/x64/Release/steam_appid.txt +++ /dev/null @@ -1 +0,0 @@ -2895980 \ No newline at end of file