From a31f4f6f25b83ef01e001056df511922e55d2dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Mon, 23 Jan 2023 00:58:07 +0100 Subject: [PATCH] fix web build --- code/foundation/src/models/prefabs/assembler.c | 2 +- code/foundation/src/models/prefabs/furnace.c | 2 +- code/foundation/src/models/prefabs/splitter.c | 2 +- win/web.bat | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/foundation/src/models/prefabs/assembler.c b/code/foundation/src/models/prefabs/assembler.c index 542837a..c91de86 100644 --- a/code/foundation/src/models/prefabs/assembler.c +++ b/code/foundation/src/models/prefabs/assembler.c @@ -18,7 +18,7 @@ uint64_t assembler_spawn(void) { producer->push_filter = PRODUCER_PUSH_PRODUCT; producer->target_item = ASSET_INVALID; - ecs_set(world_ecs(), e, ItemRouter, {1}); + ecs_set(world_ecs(), e, ItemRouter, {.push_qty = 1, .counter = 0}); return (uint64_t)e; } diff --git a/code/foundation/src/models/prefabs/furnace.c b/code/foundation/src/models/prefabs/furnace.c index 4237600..f520b1a 100644 --- a/code/foundation/src/models/prefabs/furnace.c +++ b/code/foundation/src/models/prefabs/furnace.c @@ -17,7 +17,7 @@ uint64_t furnace_spawn(void) { producer->pending_task = PRODUCER_CRAFT_AUTO; producer->push_filter = PRODUCER_PUSH_ANY; - ecs_set(world_ecs(), e, ItemRouter, {1}); + ecs_set(world_ecs(), e, ItemRouter, {.push_qty = 1, .counter = 0}); return (uint64_t)e; } diff --git a/code/foundation/src/models/prefabs/splitter.c b/code/foundation/src/models/prefabs/splitter.c index 76ce690..51ad3c2 100644 --- a/code/foundation/src/models/prefabs/splitter.c +++ b/code/foundation/src/models/prefabs/splitter.c @@ -11,7 +11,7 @@ uint64_t splitter_spawn(void) { ItemContainer *storage = ecs_get_mut(world_ecs(), e, ItemContainer); *storage = (ItemContainer){0}; - ecs_set(world_ecs(), e, ItemRouter, {1}); + ecs_set(world_ecs(), e, ItemRouter, {.push_qty = 1, .counter = 0}); return (uint64_t)e; } diff --git a/win/web.bat b/win/web.bat index 8d67bbd..c3b7c60 100644 --- a/win/web.bat +++ b/win/web.bat @@ -9,10 +9,10 @@ if not exist "..\emsdk" ( if "%EMSDK%"=="" call ..\emsdk\emsdk_env.bat rem host webserver, compile and launch -start python -m http.server --bind 127.0.0.1 8000 --directory build_web +rem start "" python3 -m http.server --bind 127.0.0.1 8000 --directory build_web pushd .. - emcmake cmake -S . -B build_web -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Web - cmake --build build_web --parallel + call emcmake cmake -S . -B build_web -DCMAKE_BUILD_TYPE=Release -DPLATFORM=Web + call cmake --build build_web --parallel move build_web\eco2d.html build_web\index.html popd