Linux changes and fixes

Adventures in Lestoria/AdventuresInLestoria.h

@@ -60,6 +60,12 @@ All rights reserved.
 #include "Overlay.h"
 #include <variant>
 
+#undef KEY_MENU
+#undef KEY_SELECT
+#undef KEY_SCROLLDOWN
+#undef KEY_SCROLLUP
+#undef KEY_ENTER
+
 class SteamKeyboardCallbackHandler;
 class SteamStatsReceivedHandler;
 
@@ -161,6 +167,8 @@ public:
 	double levelTime=0.;
 	Camera2D camera;
 	std::map<MapName,Map>MAP_DATA;
+
+	ResourcePack gamepack;
 private:
     std::vector<std::unique_ptr<Effect>>foregroundEffects,backgroundEffects,foregroundEffectsToBeInserted,backgroundEffectsToBeInserted;
 	std::vector<TileRenderData*>tilesWithCollision,tilesWithoutCollision;
@@ -215,7 +223,6 @@ private:
 	float lastMouseMovement=0.f; //Amount of time since the last time the cursor was moved or interacted with.
 	vi2d lastMousePos={};
 	bool gameInitialized=false;
-	ResourcePack gamepack;
 	uint8_t mosaicEffectTransition=1U;
 	float saveGameDisplayTime=0.f;
 	float loadingWaitTime=0.f;

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{

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.

Adventures in Lestoria/ItemEnchant.h

@@ -117,7 +117,7 @@ public:
 	std::map<ItemAttribute,float>::const_iterator begin()const;
 	std::map<ItemAttribute,float>::const_iterator end()const;
 	const Pixel&DisplayCol()const;
-	const std::optional<std::reference_wrapper<Ability>>Ability()const;
+	const std::optional<std::reference_wrapper<::Ability>>Ability()const;
 private:
 	void UpdateDescription();
 	const ItemEnchantInfo&GetEnchantInfo()const;

Adventures in Lestoria/MonsterSoul.cpp

@@ -38,7 +38,7 @@ All rights reserved.
 
 #include "Effect.h"
 #include "util.h"
-#include "AdventuresinLestoria.h"
+#include "AdventuresInLestoria.h"
 #include "SoundEffect.h"
 
 INCLUDE_game

debugGame.sh

@@ -1,4 +1,5 @@
 cd "Adventures in Lestoria"
 mkdir "Adventures in Lestoria"
 cp "discord_game_sdk.so" "Adventures in Lestoria"
+cp "libsteam_api.so" "Adventures in Lestoria"
 gdb ../bin/AdventuresInLestoria

distribute.sh

@@ -18,7 +18,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

release.sh

@@ -1,2 +1,2 @@
 git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
-cmake -DCMAKE_BUILD_TYPE=Release .;make -j 8
+cmake -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release .;make -j 8