diff --git a/Adventures in Lestoria/MonsterData.cpp b/Adventures in Lestoria/MonsterData.cpp index fcd552f8..4c53d581 100644 --- a/Adventures in Lestoria/MonsterData.cpp +++ b/Adventures in Lestoria/MonsterData.cpp @@ -41,11 +41,13 @@ All rights reserved. #include "DEFINES.h" #include "safemap.h" #include "Item.h" +#include "AdventuresInLestoria.h" INCLUDE_DATA INCLUDE_STRATEGY_DATA INCLUDE_ANIMATION_DATA INCLUDE_ITEM_DATA +INCLUDE_game std::mapMONSTER_DATA; @@ -72,7 +74,7 @@ void MonsterData::InitializeMonsterData(){ if(!MonsterData::imgs.count(MonsterImgName)){ MonsterData::imgs[MonsterImgName]=NEW Renderable(); - const rcode imgLoadResult=MonsterData::imgs[MonsterImgName]->Load("assets/monsters/commercial_assets/"+MonsterImgName+".png"); + const rcode imgLoadResult{game->LoadResource(*MonsterData::imgs[MonsterImgName],"assets/monsters/commercial_assets/"+MonsterImgName+".png")}; if(imgLoadResult!=OK)ERR(std::format("WARNING! Image loading for Monster {} failed with result {}",MonsterImgName,int(imgLoadResult))); } diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 4fd8247f..f1e21abe 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 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 11565 +#define VERSION_BUILD 11566 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/gamepack.pak b/Adventures in Lestoria/assets/gamepack.pak index 3271d998..2dbe361d 100644 Binary files a/Adventures in Lestoria/assets/gamepack.pak and b/Adventures in Lestoria/assets/gamepack.pak differ diff --git a/emscripten_build.ps1 b/emscripten_build.ps1 index 8f9a9950..bd6e0449 100755 --- a/emscripten_build.ps1 +++ b/emscripten_build.ps1 @@ -11,6 +11,7 @@ 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 +rm -R bin/assets/monsters/commercial_assets cp -R "Adventures in Lestoria/assets/music" bin/assets rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets diff --git a/emscripten_build.sh b/emscripten_build.sh index 35a9ada2..9a8b06b9 100755 --- a/emscripten_build.sh +++ b/emscripten_build.sh @@ -11,6 +11,7 @@ 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 +rm -R bin/assets/monsters/commercial_assets cp -R "Adventures in Lestoria/assets/music" bin/assets rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets diff --git a/emscripten_debug_build.ps1 b/emscripten_debug_build.ps1 index c2555168..a0466817 100644 --- a/emscripten_debug_build.ps1 +++ b/emscripten_debug_build.ps1 @@ -12,6 +12,7 @@ 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 +rm -R bin/assets/monsters/commercial_assets cp -R "Adventures in Lestoria/assets/music" bin/assets rm -R bin/assets/music/commercial_assets cp -R "Adventures in Lestoria/assets/npcs" bin/assets diff --git a/emscripten_debug_build.sh b/emscripten_debug_build.sh deleted file mode 100755 index 9b13f8c2..00000000 --- a/emscripten_debug_build.sh +++ /dev/null @@ -1,5 +0,0 @@ -git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp" -clear -source ./emsdk/emsdk_env.sh -emcmake cmake -DCMAKE_BUILD_TYPE=Debug -D_DEBUG=1 . -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 d59e0130..26d5236e 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ