summaryrefslogtreecommitdiffhomepage
path: root/not/World.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-07-12 09:04:23 +0200
committerAki <nthirtyone@gmail.com>2017-07-12 09:04:23 +0200
commit47d4e1c229adfffb70b3c984d00049bcebcfc183 (patch)
treeab4b34ade5b5cc19d122c4f396e413b61aacbf04 /not/World.lua
parent4e69182a6d36966847430f01b440a9cdac0e4cdc (diff)
downloadroflnauts-47d4e1c229adfffb70b3c984d00049bcebcfc183.zip
roflnauts-47d4e1c229adfffb70b3c984d00049bcebcfc183.tar.gz
roflnauts-47d4e1c229adfffb70b3c984d00049bcebcfc183.tar.bz2
All music playing moved to single instance of MusicPlayer
Diffstat (limited to 'not/World.lua')
-rw-r--r--not/World.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/not/World.lua b/not/World.lua
index 112846a..ab94ff4 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -26,7 +26,6 @@ require "not.Cloud"
require "not.Effect"
require "not.Decoration"
require "not.Ray"
-require "not.MusicPlayer"
-- Constructor of `World` ZA WARUDO!
function World:new (map, nauts)
@@ -46,7 +45,8 @@ function World:new (map, nauts)
self:loadMap(map)
self:spawnNauts(nauts)
self.camera = Camera:new(self)
- self.music = MusicPlayer(self.map.theme)
+ musicPlayer:setTrack(self.map.theme)
+ musicPlayer:play()
end
-- The end of the world
@@ -57,7 +57,6 @@ function World:delete ()
for _,naut in pairs(self.Nauts) do
naut:delete()
end
- self.music:delete()
self.world:destroy()
end