From 885502bf11057e7de961f178bc85ce93a9f40723 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Wed, 30 Apr 2025 12:41:27 +1000 Subject: fix songbook compile issues & some warns --- source/game/scripting/StarRootLuaBindings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/game/scripting/StarRootLuaBindings.cpp') 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, String, Maybe>("materialMiningSound", bind(RootCallbacks::materialMiningSound, root, _1, _2)); callbacks.registerCallbackWithSignature, String, Maybe>("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 const& a, Maybe const& b) -> StringList { + callbacks.registerCallback("assetsScan", [root]( Maybe const& a, Maybe 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 { + callbacks.registerCallback("itemFile", [root](String const& itemName) -> Maybe { return root->itemDatabase()->itemFile(itemName); }); -- cgit v1.2.3