🤏 More small fixes

wobbier · Aug 15, 2024 · dfbcabd · dfbcabd
1 parent 3cc0e5b
commit dfbcabd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Engine.sharpmake.cs b/Engine.sharpmake.cs
@@ -426,7 +426,6 @@ public virtual void ConfigureAll(Solution.Configuration conf, CommonTarget targe
             {
                 conf.AddProject<EntryPointGameProjectUWP>(target);
             }
-            else
             {
                 conf.AddProject<EntryPointGameProject>(target);
             }

diff --git a/Modules/Dementia/Source/Path.cpp b/Modules/Dementia/Source/Path.cpp
@@ -14,7 +14,7 @@
 
 Path::Path( const std::string& InFile, bool Raw /*= false*/ )
 {
-    OPTICK_CATEGORY( "Path", Optick::Category::IO);
+    OPTICK_CATEGORY( "Path", Optick::Category::IO );
     std::string LocalPath;
 #if USING( ME_PLATFORM_UWP )
     size_t pos;
@@ -93,6 +93,15 @@ Path::Path( const std::string& InFile, bool Raw /*= false*/ )
                 LocalPath = "Engine/" + LocalPath;
                 Exists = true;
             }
+            else
+            {
+                auto pos = FullPath.rfind( "Engine/Assets" );
+                if( pos != std::string::npos )
+                {
+                    // Gross
+                    FullPath.replace( pos, 13, "Assets" );
+                }
+            }
         }
     }
     else

diff --git a/Source/Cores/AudioCore.cpp b/Source/Cores/AudioCore.cpp
@@ -121,7 +121,7 @@ bool AudioCore::OnEvent( const BaseEvent& InEvent )
         auto sound = soundPath.GetLocalPath();
         if( m_cachedSounds.find( sound.data() ) != m_cachedSounds.end() )
         {
-            std::remove( sound.data() );
+            m_cachedSounds.erase( sound.data() );
             //auto& source = m_cachedSounds[sound.data()] = MakeShared<AudioSource>( sound.data() );
             //InitComponent( *source );
         }

diff --git a/Source/Resources/SoundResource.cpp b/Source/Resources/SoundResource.cpp
@@ -24,11 +24,13 @@ Sound::Sound( const Path& path, void* fmodSystem, bool isImmediate )
 
 Sound::~Sound()
 {
+#if USING( ME_FMOD )
     if( Handle )
     {
         Handle->release();
         Handle = nullptr;
     }
+#endif
 }
 
 bool Sound::IsReady() const