Skip to content

Commit

Permalink
Merge pull request #1986 from DaNiwa/mainmusic
Browse files Browse the repository at this point in the history
Fix music switching bug
  • Loading branch information
danhp committed Jan 15, 2014
2 parents 478c451 + 0ad05ad commit 9debe68
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/welcome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ local controls = require('inputcontroller').get()
local fonts = require 'fonts'
local Gamestate = require 'vendor/gamestate'
local menu = require 'menu'
local sound = require 'vendor/TEsound'
local tween = require 'vendor/tween'
local window = require 'window'

Expand Down Expand Up @@ -34,6 +35,7 @@ function state:enter(previous)
self.splash = love.graphics.newImage("images/openingmenu.png")
self.arrow = love.graphics.newImage("images/menu/small_arrow.png")
self.text = string.format(app.i18n('s_or_s_select_item'), controls:getKey('JUMP'), controls:getKey('ATTACK') )
self.bg = sound.playMusic("ending")

self.line = " terminal:// \n\n operations://loadprogram:(true) \n\n"..
" program:-journey-to-the-center-of-hawkthorne \n\n loading simulation ..."
Expand Down

0 comments on commit 9debe68

Please sign in to comment.