summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-07-16 17:24:09 +0200
committerAki <nthirtyone@gmail.com>2017-07-16 17:24:09 +0200
commite39c00b6e26504ba0f5fc4f0129bfceb3afe331f (patch)
treecf6b608ddc0dbf17afe34ad40f17cf3f6a5cfa25
parent73bca2d56b9a95b6b233da8ac466ba1d1f081c76 (diff)
downloadroflnauts-e39c00b6e26504ba0f5fc4f0129bfceb3afe331f.zip
roflnauts-e39c00b6e26504ba0f5fc4f0129bfceb3afe331f.tar.gz
roflnauts-e39c00b6e26504ba0f5fc4f0129bfceb3afe331f.tar.bz2
Fixed MusicPlayer bug with win and pause menus
-rw-r--r--config/menus/main.lua4
-rw-r--r--not/Menu.lua3
2 files changed, 4 insertions, 3 deletions
diff --git a/config/menus/main.lua b/config/menus/main.lua
index 85e926f..95e44ec 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -13,6 +13,10 @@ if background == nil or not background:is(require "not.MenuBackground") then
background = require "not.MenuBackground"(menu)
end
+-- Wait, only here?
+musicPlayer:setTrack("menu.ogg")
+musicPlayer:play()
+
return {
background,
Button(menu)
diff --git a/not/Menu.lua b/not/Menu.lua
index e0e4064..b835777 100644
--- a/not/Menu.lua
+++ b/not/Menu.lua
@@ -31,9 +31,6 @@ function Menu:new (name)
if Menu.sprite == nil then
Menu.sprite = love.graphics.newImage("assets/menu.png")
end
- -- musicPlayer calls should be moved to menu files; see issue with new win screen
- musicPlayer:setTrack("menu.ogg")
- musicPlayer:play()
self.elements = {}
self:open(name)
end