sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 20 Pull Requests 1 Actions Projects 1 Releases Wiki Activity

Linux changes and fixes

Browse Source
This commit is contained in:
sigonasr2 2024-09-17 14:47:35 -05:00
parent d0db3412d9
commit a16ca296c7
8 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Adventures in Lestoria/AdventuresInLestoria.h
View File

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

2
Adventures in Lestoria/Item.cpp
View File

@ -807,7 +807,7 @@ const std::string&ItemInfo::Description()const{
const ITCategory ItemInfo::Category()const{ const ITCategory ItemInfo::Category()const{
return category; return category;
} }
const::Renderable&const ItemInfo::Icon()const{ const::Renderable&ItemInfo::Icon()const{
return img.value().get(); return img.value().get();
} }
const ItemScript&ItemInfo::OnUseAction()const{ const ItemScript&ItemInfo::OnUseAction()const{

2
Adventures in Lestoria/Item.h
View File

@ -388,7 +388,7 @@ public:
const std::string&Name()const; const std::string&Name()const;
const std::string&Description()const; const std::string&Description()const;
const ITCategory Category()const; const ITCategory Category()const;
const::Renderable&const Icon()const; const::Renderable& Icon()const;
static const EquipSlot StringToEquipSlot(std::string_view slotName); static const EquipSlot StringToEquipSlot(std::string_view slotName);
/* /*
For the useFunc, return true if the item can be used, false otherwise. For the useFunc, return true if the item can be used, false otherwise.

2
Adventures in Lestoria/ItemEnchant.h
View File

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

2
Adventures in Lestoria/MonsterSoul.cpp
View File

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

1
debugGame.sh
View File

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

2
distribute.sh
View File

@ -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/gamepack.pak" release/assets
cp -R "Adventures in Lestoria/assets/"*.ttf release/assets cp -R "Adventures in Lestoria/assets/"*.ttf release/assets
cp -R "Adventures in Lestoria/controller_config" release 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 cp -R bin release
rm release/*.pdb rm release/*.pdb

2
release.sh
View File

@ -1,2 +1,2 @@
git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp" 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