Merge branch 'main' of https://github.com/lovebrew/lovepotion

lovebrew · Sep 28, 2024 · 07ca315 · 07ca315
2 parents a85d783 + 16e6b6b
commit 07ca315
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 include(FetchContent)
 
 set(LOVE_VERSION "12.0")
-set(APP_VERSION  "3.0.0")
+set(APP_VERSION  "3.0.2")
 
 set(APP_TITLE  "LÖVE Potion")
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")

diff --git a/source/modules/love/scripts/boot.lua b/source/modules/love/scripts/boot.lua
@@ -98,6 +98,8 @@ function love.boot()
             main_file = source_leaf
             custom_main_file = true
             full_source = love.path.getFull(full_source:sub(1, -(#source_leaf + 1)))
+        elseif nouri:match("%.love$") then
+            full_source = nouri
         end
 
         can_has_game = pcall(love.filesystem.setSource, full_source)

diff --git a/source/objects/source/wrap_source.cpp b/source/objects/source/wrap_source.cpp
@@ -279,7 +279,7 @@ static constexpr luaL_Reg functions[] =
     { "clone",              Wrap_Source::Clone              },
     { "play",               Wrap_Source::Play               },
     { "pause",              Wrap_Source::Pause              },
-    { "stop",               Wrap_Source::Pause              },
+    { "stop",               Wrap_Source::Stop               },
     { "setVolume",          Wrap_Source::SetVolume          },
     { "getVolume",          Wrap_Source::GetVolume          },
     { "seek",               Wrap_Source::Seek               },