summaryrefslogtreecommitdiffhomepage
path: root/not/World.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-06-27 09:05:16 +0200
committerAki <nthirtyone@gmail.com>2017-06-27 09:05:16 +0200
commitae8ce1a11ca02297ff9fe05b3146c620a2485975 (patch)
treea18c46b9a9bed6ee56083082f2a2d41b74dce22a /not/World.lua
parentbaf04a055dbc66b80c29a406907a0a595ac55f00 (diff)
downloadroflnauts-ae8ce1a11ca02297ff9fe05b3146c620a2485975.zip
roflnauts-ae8ce1a11ca02297ff9fe05b3146c620a2485975.tar.gz
roflnauts-ae8ce1a11ca02297ff9fe05b3146c620a2485975.tar.bz2
Scenes now use MusicPlayer
Diffstat (limited to 'not/World.lua')
-rw-r--r--not/World.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/not/World.lua b/not/World.lua
index 99f50fa..112846a 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -26,7 +26,7 @@ require "not.Cloud"
require "not.Effect"
require "not.Decoration"
require "not.Ray"
-require "not.Music"
+require "not.MusicPlayer"
-- Constructor of `World` ZA WARUDO!
function World:new (map, nauts)
@@ -46,7 +46,7 @@ function World:new (map, nauts)
self:loadMap(map)
self:spawnNauts(nauts)
self.camera = Camera:new(self)
- self.music = Music:new(self.map.theme)
+ self.music = MusicPlayer(self.map.theme)
end
-- The end of the world
@@ -402,4 +402,4 @@ function World:controlreleased (set, action, key)
for k,naut in pairs(self:getNautsAll()) do
naut:controlreleased(set, action, key)
end
-end \ No newline at end of file
+end