"Audio.music" system with music overriding

LunaDll/LuaMain/LuaProxyComponent/LuaProxyAudio.cpp

@@ -9,6 +9,7 @@
 #include "../../SMBXInternal/PlayerMOB.h"
 #include "../../SMBXInternal/Level.h"
 #include "../../SMBXInternal/Sound.h"
+#include "../../Misc/ResourceFileMapper.h"
 
 #include <memory>
 #include <mutex>
@@ -345,6 +346,22 @@ Mix_Chunk* LuaProxy::Audio::newMix_Chunk()
     return NULL;
 }
 
+void LuaProxy::Audio::__setOverrideForMusicAlias(const std::string& alias, std::string chunk)
+{
+#ifndef NO_SDL
+    PGE_MusPlayer::setOverrideForMusicAlias(alias, chunk);
+#endif
+}
+
+std::string LuaProxy::Audio::__getMusicForAlias(const std::string& alias, int type)
+{
+#ifndef NO_SDL
+    return PGE_MusPlayer::getMusicForAlias(alias, type);
+#else
+    return "";
+#endif
+}
+
 
 
 void LuaProxy::Audio::clearSFXBuffer()
@@ -378,7 +395,7 @@ Mix_Chunk *LuaProxy::Audio::SfxOpen(const std::string& filename, lua_State* L)
         // If error, pass to Lua
         luaL_error(L, "%s", PGE_Sounds::SND_getLastError());
     }
-
+    
     return chunk;
 }
 

LunaDll/LuaMain/LuaProxyComponent/LuaProxyAudio.h

@@ -4,6 +4,11 @@
 
 #include <string>
 #include <memory>
+
+#include "../../SdlMusic/MusicManager.h"
+#include "../../SdlMusic/SdlMusPlayer.h"
+#include "../../Defines.h"
+
 struct Mix_Chunk;
 class MciEmulator;
 struct lua_State;
@@ -54,6 +59,9 @@ namespace LuaProxy
         double  MusicGetPitch();
         double  MusicGetSpeed();
 
+        void __setOverrideForMusicAlias(const std::string& alias, std::string chunk);
+        std::string __getMusicForAlias(const std::string& alias, int type);
+
         //SFX
         Mix_Chunk* newMix_Chunk();
         void clearSFXBuffer();

LunaDll/LuaMain/LunaLuaMain.cpp

@@ -160,6 +160,7 @@ bool CLunaLua::shutdown()
     m_ready = false;
     m_onStartRan = false;
     m_luaCallDepth = 0;
+
     LuaProxy::Audio::resetMciSections();
     lua_close(L);
     L = NULL;
@@ -905,6 +906,9 @@ void CLunaLua::bindAll()
                 def("MusicGetPitch", (double(*)())&LuaProxy::Audio::MusicGetPitch),
                 def("MusicGetSpeed", (double(*)())&LuaProxy::Audio::MusicGetSpeed),
 
+                def("__setOverrideForMusicAlias", LuaProxy::Audio::__setOverrideForMusicAlias),
+                def("__getMusicForAlias", LuaProxy::Audio::__getMusicForAlias),
+
                 //SFX
                 def("newMix_Chunk", (Mix_Chunk*(*)())&LuaProxy::Audio::newMix_Chunk),
                 def("clearSFXBuffer", (void(*)())&LuaProxy::Audio::clearSFXBuffer),

LunaDll/Main.cpp

@@ -291,6 +291,7 @@ int TestFunc()
     }
 
     Blocks::DoSortingIfRequired();
+
     return 0;
 }
 

LunaDll/Misc/RuntimeHookComponents/RuntimeHookHooks.cpp

@@ -1479,6 +1479,7 @@ extern void __stdcall RenderLevelHook()
     short oldRenderDoneCameraUpdate = g_renderDoneCameraUpdate;
     g_renderDoneCameraUpdate = 0;
     RenderLevelReal();
+    MusicManager::update();
     g_renderDoneCameraUpdate = oldRenderDoneCameraUpdate;
 
     if (g_GLEngine.IsEnabled() && !Renderer::IsAltThreadActive())
@@ -1552,6 +1553,7 @@ extern void __stdcall RenderWorldHook()
     }
     g_EventHandler.hookWorldRenderStart();
     RenderWorldReal();
+    MusicManager::update();
     if (g_GLEngine.IsEnabled() && !Renderer::IsAltThreadActive())
     {
         g_GLEngine.EndFrame(g_GLEngine.GetHDC());

LunaDll/SdlMusic/MusicDefList.cpp

@@ -78,7 +78,7 @@ std::string MusicManager::musAliasesList[75]=
     "music53",
     "music54",
     "music55",
-    "music56"  //73
+    "music56"  //75
 };
 
 std::string MusicManager::chunksAliasesList[91]=