diff --git a/.gitignore b/.gitignore index bee7a5a5..eb0f3c58 100644 --- a/.gitignore +++ b/.gitignore @@ -396,3 +396,4 @@ build/CMakeFiles/3.16.3/CompilerIdC/CMakeCCompilerId.c build/CMakeFiles/3.16.3/CompilerIdCXX/CMakeCXXCompilerId.cpp test.cpp /Adventures in Lestoria/Adventures in Lestoria +/Adventures in Lestoria/packkey.cpp diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj b/Adventures in Lestoria/Adventures in Lestoria.vcxproj index 03918a46..5d9bcfec 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj @@ -678,6 +678,7 @@ + diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters index 17ad0c8a..a456dcc7 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters @@ -818,6 +818,9 @@ Source Files + + Source Files + diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 97b2bd7b..6ece5f7b 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -82,6 +82,7 @@ INCLUDE_EMITTER_LIST INCLUDE_ITEM_CATEGORIES INCLUDE_BACKDROP_DATA INCLUDE_MONSTER_DATA +INCLUDE_PACK_KEY bool _DEBUG_MAP_LOAD_INFO = false; //360x240 @@ -227,8 +228,7 @@ AiL::AiL() } bool AiL::OnUserCreate(){ - std::string packKey="129jvgndsaf7dsa8932hj"; - gamepack.LoadPack("assets/"+"gamepack_file"_S,packKey); + gamepack.LoadPack("assets/"+"gamepack_file"_S,PACK_KEY); GamePad::init(); @@ -320,7 +320,7 @@ bool AiL::OnUserCreate(){ gameInitialized=true; if(!gamepack.Loaded()&&"GENERATE_GAMEPACK"_B){ - gamepack.SavePack("assets/"+"gamepack_file"_S,packKey); + gamepack.SavePack("assets/"+"gamepack_file"_S,PACK_KEY); std::cout<<"Game Pack has been generated!"<ITEM_CONVERSIONS; +#define INCLUDE_PACK_KEY extern std::string PACK_KEY; + #define INCLUDE_BACKDROP_DATA extern std::mapBACKDROP_DATA; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 57411b1a..f240c57b 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 7603 +#define VERSION_BUILD 7608 #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 4dcbab7c..5f19bf64 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ