diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index b5468e8b..04a57b25 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -167,9 +167,10 @@ public: double levelTime=0.; Camera2D camera; std::mapMAP_DATA; + ResourcePack gamepack; private: - std::vector>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted; + std::vector>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted; std::vectortilesWithCollision,tilesWithoutCollision; std::vectordropsBeforeLower,dropsAfterLower,dropsBeforeUpper,dropsAfterUpper; std::vectorendZones,upperEndZones; diff --git a/Adventures in Lestoria/Item.cpp b/Adventures in Lestoria/Item.cpp index fb6a638e..6582bafd 100644 --- a/Adventures in Lestoria/Item.cpp +++ b/Adventures in Lestoria/Item.cpp @@ -807,7 +807,7 @@ const std::string&ItemInfo::Description()const{ const ITCategory ItemInfo::Category()const{ return category; } -const::Renderable&const ItemInfo::Icon()const{ +const::Renderable&ItemInfo::Icon()const{ return img.value().get(); } const ItemScript&ItemInfo::OnUseAction()const{ @@ -1537,4 +1537,4 @@ const ItemEnchantInfo Item::ApplyRandomEnchant(){ Inventory::RemoveItem(FragmentName(),"Fragment Enchant Cost"_i[0]); game->GetPlayer()->RemoveMoney("Fragment Enchant Cost"_i[1]); return ItemEnchantInfo::GetEnchant(randomEnchantName); -} \ No newline at end of file +} diff --git a/Adventures in Lestoria/Item.h b/Adventures in Lestoria/Item.h index a0b15154..543881a3 100644 --- a/Adventures in Lestoria/Item.h +++ b/Adventures in Lestoria/Item.h @@ -388,7 +388,7 @@ public: const std::string&Name()const; const std::string&Description()const; const ITCategory Category()const; - const::Renderable&const Icon()const; + const::Renderable& Icon()const; static const EquipSlot StringToEquipSlot(std::string_view slotName); /* For the useFunc, return true if the item can be used, false otherwise. @@ -436,4 +436,4 @@ public: void ResetTimer(); }; -#define ISBLANK(itemRef) Item::IsBlank(itemRef) \ No newline at end of file +#define ISBLANK(itemRef) Item::IsBlank(itemRef) diff --git a/debugGame.sh b/debugGame.sh old mode 100755 new mode 100644 index 23b0d099..4e09f196 --- a/debugGame.sh +++ b/debugGame.sh @@ -1,5 +1,5 @@ cd "Adventures in Lestoria" mkdir "Adventures in Lestoria" cp "discord_game_sdk.so" "Adventures in Lestoria" -cp "Adventures in Lestoria/"*.so "release/Adventures in Lestoria" +cp "libsteam_api.so" "Adventures in Lestoria" gdb ../bin/AdventuresInLestoria diff --git a/distribute.sh b/distribute.sh index 5d04f5d5..f82d62ee 100755 --- a/distribute.sh +++ b/distribute.sh @@ -19,7 +19,7 @@ cp -R "Adventures in Lestoria/assets/themes" release/assets cp -R "Adventures in Lestoria/assets/gamepack.pak" release/assets cp -R "Adventures in Lestoria/assets/"*.ttf release/assets cp -R "Adventures in Lestoria/controller_config" release -cp "Adventures in Lestoria/Adventures in Lestoria/"*.so "release/Adventures in Lestoria" +cp "Adventures in Lestoria/"*.so "release/Adventures in Lestoria" cp -R bin release rm release/*.pdb @@ -31,4 +31,4 @@ if [ \`bin/AdventuresInLestoria | wc -l\` -lt 20 ]; then bin/AdventuresInLestoria nosteam else echo \"Success!\" -fi" > release/runGame.sh \ No newline at end of file +fi" > release/runGame.sh