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

Linux fixes. Make sure audio doesn't require loading from filesystem (Use resource packs instead)

Browse Source
This commit is contained in:
sigonasr2 2024-09-17 17:43:48 -05:00
parent d9f84336f2
commit c15b45b975
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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,6 +167,7 @@ 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;
@ -215,7 +222,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;

4
Adventures in Lestoria/Audio.cpp
View File

@ -70,9 +70,11 @@ void Audio::Initialize(){
while(data.HasProperty(std::format("channel[{}]",channelCounter))){ while(data.HasProperty(std::format("channel[{}]",channelCounter))){
std::string channelName=data[std::format("channel[{}]",channelCounter)].GetString(); std::string channelName=data[std::format("channel[{}]",channelCounter)].GetString();
if(!game->gamepack.Loaded()){
if(!std::filesystem::exists("bgm_directory"_S+channelName))ERR(std::format("WARNING! Could not load file {} for track {}",channelName,songFileName)); if(!std::filesystem::exists("bgm_directory"_S+channelName))ERR(std::format("WARNING! Could not load file {} for track {}",channelName,songFileName));
if(!game->gamepack.Loaded()&&"GENERATE_GAMEPACK"_B){ if("GENERATE_GAMEPACK"_B){
game->gamepack.AddFile("bgm_directory"_S+channelName); game->gamepack.AddFile("bgm_directory"_S+channelName);
}
} }
bgm.AddChannel(channelName); bgm.AddChannel(channelName);
channelCounter++; channelCounter++;

2
Adventures in Lestoria/ItemEnchant.h
View File

@ -115,7 +115,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 "Adventures in Lestoria/"*.so "release/Adventures in Lestoria"
gdb ../bin/AdventuresInLestoria gdb ../bin/AdventuresInLestoria

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