SashLilac/cambridge
1
0
Fork 0
mirror of https://github.com/SashLilac/cambridge.git synced 2024-11-22 03:29:02 -06:00
Code Issues Projects Releases Wiki Activity

BGM playing changes and bugfixes

Browse Source
This commit is contained in:
Ishaan Bhardwaj 2023-07-15 02:18:43 -04:00
parent a972c31d9a
commit 7199aa7ef6
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
load/bgm.lua
View File

@ -7,13 +7,15 @@ bgm = {
local current_bgm = nil local current_bgm = nil
local bgm_locked = false local bgm_locked = false
local unfocused = false
function switchBGM(sound, subsound) function switchBGM(sound, subsound)
if bgm_locked then
return
end
if current_bgm ~= nil then if current_bgm ~= nil then
current_bgm:stop() current_bgm:stop()
end end
if bgm_locked or config.bgm_volume <= 0 then if config.bgm_volume <= 0 then
current_bgm = nil current_bgm = nil
elseif sound ~= nil then elseif sound ~= nil then
if subsound ~= nil then if subsound ~= nil then
@ -67,24 +69,19 @@ function processBGMFadeout(dt)
fadeout_time = 0 fadeout_time = 0
fading_bgm = false fading_bgm = false
end end
current_bgm:setVolume(fadeout_time * config.bgm_volume / total_fadeout_time) current_bgm:setVolume(
fadeout_time * config.bgm_volume / total_fadeout_time
)
end end
end end
function pauseBGM(f) function pauseBGM()
if f then
unfocused = true
end
if current_bgm ~= nil then if current_bgm ~= nil then
current_bgm:pause() current_bgm:pause()
end end
end end
function resumeBGM(f) function resumeBGM()
if f and scene.paused and unfocused then
unfocused = false
return
end
if current_bgm ~= nil then if current_bgm ~= nil then
current_bgm:play() current_bgm:play()
end end

8
main.lua
View File

@ -280,14 +280,6 @@ function love.wheelmoved(x, y)
scene:onInputPress({input=nil, type="wheel", x=x, y=y}) scene:onInputPress({input=nil, type="wheel", x=x, y=y})
end end
function love.focus(f)
if f then
resumeBGM(true)
else
pauseBGM(true)
end
end
function love.resize(w, h) function love.resize(w, h)
GLOBAL_CANVAS:release() GLOBAL_CANVAS:release()
GLOBAL_CANVAS = love.graphics.newCanvas(w, h) GLOBAL_CANVAS = love.graphics.newCanvas(w, h)

2
scene/credits.lua
View File

@ -16,9 +16,7 @@ function CreditsScene:new()
end end
function CreditsScene:update() function CreditsScene:update()
if love.window.hasFocus() then
self.frames = self.frames + 1 self.frames = self.frames + 1
end
if self.frames >= 2100 * self.scroll_speed then if self.frames >= 2100 * self.scroll_speed then
playSE("mode_decide") playSE("mode_decide")
scene = TitleScene() scene = TitleScene()