diff --git a/.gitignore b/.gitignore index 4ddbe5ab..e6331368 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ *.sln.docstates emsdk emscripten +release commercial_assets *.o *.h.gch @@ -400,3 +401,6 @@ test.cpp /x64/Release/Adventures in Lestoria.zip /x64/Release/Adventures in Lestoria_web.zip /x64/Release/AdventuresInLestoria_web.zip +Adventures in Lestoria/packkey.cpp +Adventures in Lestoria/packkey.cpp +packkey.cpp \ No newline at end of file diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 2b406f3f..ad7d5481 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -2691,9 +2691,17 @@ int main() windowPosConf={loadSystemFile["Window Pos"].GetInt(0),loadSystemFile["Window Pos"].GetInt(1)}; } if(loadSystemFile.HasProperty("Window Size"))windowSizeConf={loadSystemFile["Window Size"].GetInt(0),loadSystemFile["Window Size"].GetInt(1)}; - size_t requiredSize; + size_t requiredSize=0; - getenv_s( &requiredSize, NULL, 0, "SteamTenfoot"); + #ifdef WIN32 + getenv_s( &requiredSize, NULL, 0, "SteamTenfoot"); + #else + const char*bigPicture=getenv("SteamTenfoot"); + if(bigPicture){ + requiredSize=strlen(bigPicture); + LOG("Big Picture reported a length of "<0)fullscreenConf=true; } diff --git a/Adventures in Lestoria/InputKeyboardWindow.cpp b/Adventures in Lestoria/InputKeyboardWindow.cpp index fcdc217a..0912c3a8 100644 --- a/Adventures in Lestoria/InputKeyboardWindow.cpp +++ b/Adventures in Lestoria/InputKeyboardWindow.cpp @@ -43,6 +43,8 @@ All rights reserved. #include "InputDisplayComponent.h" #include "olcPGEX_Gamepad.h" +#undef KEY_BACK + using A=Attribute; INCLUDE_WINDOW_SIZE diff --git a/Adventures in Lestoria/Key.cpp b/Adventures in Lestoria/Key.cpp index dd757123..54974199 100644 --- a/Adventures in Lestoria/Key.cpp +++ b/Adventures in Lestoria/Key.cpp @@ -142,7 +142,7 @@ std::unordered_mapInput::steamIconToGameIcon{ }; Input::Input(InputType type,int key) - :type(type),key(key){} + :type(type),key(key){} void Input::Initialize(){ for(int i=0;i