Skip to content

Commit e2a2208

Browse files
committed
Change injection of buildscripts location envvar
1 parent a683f9f commit e2a2208

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

builds/cmake/CMakePresetsBase.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"displayName": "builds for YNO (SDL2, SIMD)",
110110
"hidden": true,
111111
"inherits": "build-yno",
112+
"toolchainFile": "$env{EASYRPG_BUILDSCRIPTS_SIMD}/emscripten/emsdk-portable/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake",
112113
"cacheVariables": {
113114
"PLAYER_JS_OUTPUT_NAME": "ynoengine-simd",
114115
"CMAKE_CXX_FLAGS": "-msimd128"

src/game_map.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
#include <lcf/rpg/save.h>
5858
#include "scene_gameover.h"
5959
#include "multiplayer/game_multiplayer.h"
60-
#include <emscripten/emscripten.h>
6160
#include "feature.h"
61+
#include "web_api.h"
6262

6363
namespace {
6464
// Intended bad value, Game_Map::Init sets them correctly
@@ -375,9 +375,7 @@ std::unique_ptr<lcf::rpg::Map> Game_Map::LoadMapFile(int map_id, bool map_change
375375
Output::Debug("Loaded Map {}", map_name);
376376

377377
if (map_changed) {
378-
EM_ASM({
379-
onLoadMap(UTF8ToString($0));
380-
}, map_name.c_str());
378+
Web_API::OnLoadMap(map_name);
381379
}
382380

383381
if (map.get() == NULL) {

src/web_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ std::string Web_API::GetSocketURL() {
1616

1717
void Web_API::OnLoadMap(std::string_view name) {
1818
EM_ASM({
19-
onLoadMap(UTF8ToString($0));
19+
onLoadMap(UTF8ToString($0, $1));
2020
}, name.data(), name.size());
2121
}
2222

0 commit comments

Comments
 (0)