Fix Issue #32 for emscripten/linux builds
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
This commit is contained in:
parent
ad10a08644
commit
790a1f7181
Binary file not shown.
|
Before Width: | Height: | Size: 36 MiB After Width: | Height: | Size: 36 MiB |
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -1701,20 +1701,6 @@ void AiL::InitializeLevel(std::string mapFile,MapName map){
|
|||||||
std::cout<<" Clearing Layer Data..."<<std::endl;
|
std::cout<<" Clearing Layer Data..."<<std::endl;
|
||||||
MAP_DATA[map].LayerData.clear();
|
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){
|
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);
|
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"]){
|
for(auto&[key,size]:DATA["Backdrops"]){
|
||||||
Renderable&backdrop=BACKDROP_DATA[key];
|
Renderable&backdrop=BACKDROP_DATA[key];
|
||||||
backdrop.Load("backdrop_directory"_S+DATA["Backdrops"][key].GetString(),nullptr,false,false);
|
backdrop.Load("backdrop_directory"_S+DATA["Backdrops"][key].GetString(),nullptr,false,false);
|
||||||
|
|||||||
@ -4,7 +4,7 @@ source utils/define.sh
|
|||||||
|
|
||||||
define PROJECT_NAME "Adventures in Lestoria"
|
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 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++"
|
define LANGUAGE "C++"
|
||||||
|
|
||||||
source utils/main.sh
|
source utils/main.sh
|
||||||
|
|||||||
0
emscripten_build.ps1
Normal file → Executable file
0
emscripten_build.ps1
Normal file → Executable file
Loading…
x
Reference in New Issue
Block a user