diff options
author | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-04-30 12:41:27 +1000 |
---|---|---|
committer | Kae <80987908+Novaenia@users.noreply.github.com> | 2025-04-30 12:41:27 +1000 |
commit | 885502bf11057e7de961f178bc85ce93a9f40723 (patch) | |
tree | 7c0c8920c335c67558878d38cb7fc2d3c9d3e190 /source/game/scripting/StarRootLuaBindings.cpp | |
parent | 1af9343e61ccf24fe55127d458df614d94f8ba7d (diff) |
fix songbook compile issues & some warns
Diffstat (limited to 'source/game/scripting/StarRootLuaBindings.cpp')
-rw-r--r-- | source/game/scripting/StarRootLuaBindings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/game/scripting/StarRootLuaBindings.cpp b/source/game/scripting/StarRootLuaBindings.cpp index e9b78bc..4e60595 100644 --- a/source/game/scripting/StarRootLuaBindings.cpp +++ b/source/game/scripting/StarRootLuaBindings.cpp @@ -66,11 +66,11 @@ LuaCallbacks LuaBindings::makeRootCallbacks() { callbacks.registerCallbackWithSignature<Maybe<String>, String, Maybe<String>>("materialMiningSound", bind(RootCallbacks::materialMiningSound, root, _1, _2)); callbacks.registerCallbackWithSignature<Maybe<String>, String, Maybe<String>>("materialFootstepSound", bind(RootCallbacks::materialFootstepSound, root, _1, _2)); - callbacks.registerCallback("assetsByExtension", [root](LuaEngine& engine, String const& extension) -> CaseInsensitiveStringSet { + callbacks.registerCallback("assetsByExtension", [root](String const& extension) -> CaseInsensitiveStringSet { return root->assets()->scanExtension(extension); }); - callbacks.registerCallback("assetsScan", [root](LuaEngine& engine, Maybe<String> const& a, Maybe<String> const& b) -> StringList { + callbacks.registerCallback("assetsScan", [root]( Maybe<String> const& a, Maybe<String> const& b) -> StringList { return b ? root->assets()->scan(a.value(), *b) : root->assets()->scan(a.value()); }); @@ -115,12 +115,12 @@ LuaCallbacks LuaBindings::makeRootCallbacks() { return table; }); - callbacks.registerCallback("assetSourceMetadata", [root](LuaEngine& engine, String const& assetSourcePath) { + callbacks.registerCallback("assetSourceMetadata", [root](String const& assetSourcePath) { auto assets = root->assets(); return assets->assetSourceMetadata(assetSourcePath); }); - callbacks.registerCallback("itemFile", [root](LuaEngine& engine, String const& itemName) -> Maybe<String> { + callbacks.registerCallback("itemFile", [root](String const& itemName) -> Maybe<String> { return root->itemDatabase()->itemFile(itemName); }); |