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

Fix Issue #32 for emscripten/linux builds

Browse Source 
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
sigonasr2, Sig, Sigo 2024-01-17 15:44:18 +00:00
parent ad10a08644
commit 790a1f7181
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Adventures in Lestoria/Adventures in Lestoria.data
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 MiB

After

Width:  |  Height:  |  Size: 36 MiB

2
Adventures in Lestoria/Adventures in Lestoria.js
View File

File diff suppressed because one or more lines are too long

BIN
Adventures in Lestoria/Adventures in Lestoria.wasm
View File

Binary file not shown.

28
Adventures in Lestoria/AdventuresInLestoria.cpp
View File

@ -1701,20 +1701,6 @@ void AiL::InitializeLevel(std::string mapFile,MapName map){
std::cout<<" Clearing Layer Data..."<<std::endl;
MAP_DATA[map].LayerData.clear();
}
for(ConnectionPoint&cp:State_OverworldMap::connections){
if(cp.levelDataExists)continue;
if(VisualNovel::storyLevelData.count(cp.map)){ //Visual novel story data for story levels.
cp.levelDataExists=true;
}
if(MAP_DATA.find(cp.map)!=MAP_DATA.end()){
MAP_DATA[map].name=cp.name;
for(std::string spawn:MAP_DATA[map].spawns){
cp.spawns.push_back(spawn);
}
cp.levelDataExists=true;
}
}
}
void AiL::LoadLevel(MapName map){
@ -2314,6 +2300,20 @@ void AiL::InitializeLevels(){
InitializeLevel("map_path"_S+operator""_S(("Levels."+key).c_str(),("Levels."+key).size()),key);
}
for(ConnectionPoint&cp:State_OverworldMap::connections){
if(cp.levelDataExists)continue;
if(VisualNovel::storyLevelData.count(cp.map)){ //Visual novel story data for story levels.
cp.levelDataExists=true;
}
if(MAP_DATA.find(cp.map)!=MAP_DATA.end()){
MAP_DATA[cp.map].name=cp.name;
for(std::string spawn:MAP_DATA[cp.map].spawns){
cp.spawns.push_back(spawn);
}
cp.levelDataExists=true;
}
}
for(auto&[key,size]:DATA["Backdrops"]){
Renderable&backdrop=BACKDROP_DATA[key];
backdrop.Load("backdrop_directory"_S+DATA["Backdrops"][key].GetString(),nullptr,false,false);

2
Adventures in Lestoria/sig
View File

@ -4,7 +4,7 @@ source utils/define.sh
define PROJECT_NAME "Adventures in Lestoria"
define CUSTOM_PARAMS "-Idiscord-files -I/usr/include/freetype2 -I/usr/include/libpng16 -std=c++20 -lGL -lX11 -lpthread -lpng -lstdc++fs -lfreetype -I/usr/include/lua5.3 ./discord_game_sdk.so"
define EMSCRIPTEN_CUSTOM_PARAMS "-s MAXIMUM_MEMORY=4GB"
define EMSCRIPTEN_CUSTOM_PARAMS "-sALLOW_MEMORY_GROWTH=1 -sMAX_WEBGL_VERSION=2 -sMIN_WEBGL_VERSION=2 -sUSE_LIBPNG=1 -sUSE_FREETYPE=1 -sLLD_REPORT_UNDEFINED -sFETCH=1 -sEXPORTED_RUNTIME_METHODS=stringToNewUTF8 --proxy-to-worker"
define LANGUAGE "C++"
source utils/main.sh

0
emscripten_build.ps1 Normal file → Executable file
View File