evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read object script paths from params again taking relative paths into account

Browse Source 
also made build artifact names a bit more consistent
This commit is contained in:
Kae 2024-06-22 14:02:02 +10:00
parent 83686a816c
commit 4c90472977
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_macos.yml vendored
View File

@ -51,7 +51,7 @@ jobs:
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OpenStarbound-Dev-macOS-Intel name: OpenStarbound-macOS-Intel
path: dist/* path: dist/*
build-arm: build-arm:
@ -93,5 +93,5 @@ jobs:
- name: Upload Artifacts - name: Upload Artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: OpenStarbound-Dev-macOS-Silicon name: OpenStarbound-macOS-Silicon
path: dist/* path: dist/*

2
.github/workflows/build_windows.yml vendored
View File

@ -85,5 +85,5 @@ jobs:
- name: Upload Installer - name: Upload Installer
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: Installer name: OpenStarbound-Windows-Installer
path: installer/* path: installer/*

3
source/game/StarObject.cpp
View File

@ -188,7 +188,8 @@ void Object::init(World* world, EntityId entityId, EntityMode mode) {
setKeepAlive(configValue("keepAlive", false).toBool()); setKeepAlive(configValue("keepAlive", false).toBool());
m_scriptComponent.setScripts(m_config->scripts); auto scripts = jsonToStringList(configValue("scripts", JsonArray()).toArray());
m_scriptComponent.setScripts(scripts.transformed(bind(AssetPath::relativeTo, m_config->path, _1)));
m_scriptComponent.setUpdateDelta(configValue("scriptDelta", 5).toInt()); m_scriptComponent.setUpdateDelta(configValue("scriptDelta", 5).toInt());
m_scriptComponent.addCallbacks("object", makeObjectCallbacks()); m_scriptComponent.addCallbacks("object", makeObjectCallbacks());