fix songbook compile issues & some warns

3 files changed, 8 insertions, 10 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);
     });
 
diff --git a/source/game/scripting/StarScriptableThread.cpp b/source/game/scripting/StarScriptableThread.cpp
index cbd32ad..6bbfece 100644
--- a/source/game/scripting/StarScriptableThread.cpp
+++ b/source/game/scripting/StarScriptableThread.cpp
@@ -14,9 +14,9 @@ namespace Star {
 ScriptableThread::ScriptableThread(Json parameters)
   : Thread("ScriptableThread: " + parameters.getString("name")), // TODO
     m_stop(false),
+    m_parameters(std::move(parameters)),
     m_errorOccurred(false),
-    m_shouldExpire(true),
-    m_parameters(std::move(parameters)) {
+    m_shouldExpire(true) {
       m_luaRoot = make_shared<LuaRoot>();
       m_name = m_parameters.getString("name");
       
@@ -78,8 +78,6 @@ void ScriptableThread::passMessage(Message&& message) {
 
 void ScriptableThread::run() {
   try {
-    auto& root = Root::singleton();
-    
     double updateMeasureWindow = m_parameters.getDouble("updateMeasureWindow",0.5);
     TickRateApproacher tickApproacher(1.0f / m_timestep, updateMeasureWindow);
 
diff --git a/source/game/scripting/StarSongbookLuaBindings.cpp b/source/game/scripting/StarSongbookLuaBindings.cpp
index e2f70a3..7831ed6 100644
--- a/source/game/scripting/StarSongbookLuaBindings.cpp
+++ b/source/game/scripting/StarSongbookLuaBindings.cpp
@@ -10,8 +10,8 @@ LuaCallbacks LuaBindings::makeSongbookCallbacks(Songbook* songbook) {
   callbacks.registerCallbackWithSignature<void, String, Vec2F>("keepAlive", bind(mem_fn(&Songbook::keepAlive), songbook, _1, _2));
   callbacks.registerCallbackWithSignature<void>("stop", bind(mem_fn(&Songbook::stop), songbook));
   callbacks.registerCallbackWithSignature<bool>("active", bind(mem_fn(&Songbook::active), songbook));
-  callbacks.registerCallbackWithSignature<String>("band", bind(mem_fn(&Songbook::timeSource), songbook));
-  callbacks.registerCallbackWithSignature<String>("instrument", bind(mem_fn(&Songbook::instrument), songbook));
+  callbacks.registerCallbackWithSignature<Maybe<String>>("band", bind(mem_fn(&Songbook::timeSource), songbook));
+  callbacks.registerCallbackWithSignature<Maybe<String>>("instrument", bind(mem_fn(&Songbook::instrument), songbook));
   callbacks.registerCallbackWithSignature<bool>("instrumentPlaying", bind(mem_fn(&Songbook::instrumentPlaying), songbook));
   callbacks.registerCallbackWithSignature<Json>("song", bind(mem_fn(&Songbook::song), songbook));