summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2016-08-22 17:22:49 +0200
committerAki <nthirtyone@gmail.com>2016-08-22 17:22:49 +0200
commitdd32c9c620918a3b0da59e42ff343cdd78a12a39 (patch)
treeaf0979b717e3bdbf40f553b8449c0b14df812511
parente57a5b0b77c1ba3a2f05371c551d0e61fc9ce709 (diff)
downloadroflnauts-dd32c9c620918a3b0da59e42ff343cdd78a12a39.zip
roflnauts-dd32c9c620918a3b0da59e42ff343cdd78a12a39.tar.gz
roflnauts-dd32c9c620918a3b0da59e42ff343cdd78a12a39.tar.bz2
added music
-rw-r--r--assets/music/menu.ogg (renamed from assets/music/ROFLmenu.ogg)bin1041812 -> 1041812 bytes
-rw-r--r--menu.lua5
2 files changed, 4 insertions, 1 deletions
diff --git a/assets/music/ROFLmenu.ogg b/assets/music/menu.ogg
index 07bcb89..07bcb89 100644
--- a/assets/music/ROFLmenu.ogg
+++ b/assets/music/menu.ogg
Binary files differ
diff --git a/menu.lua b/menu.lua
index 9c7481b..49c067d 100644
--- a/menu.lua
+++ b/menu.lua
@@ -3,12 +3,14 @@
-- I do know that model I used here and in `World` loading configuration files is not flawless but I did not want to rewrite `World`s one but wanted to keep things similar at least in project scope.
require "selector"
+require "music"
-- Here it begins
Menu = {
scale = getScale(),
elements, --table
- active = 1
+ active = 1,
+ music
}
function Menu:new(name)
local o = {}
@@ -16,6 +18,7 @@ function Menu:new(name)
self.__index = self
o.elements = {}
o:load(name)
+ o.music = Music:new("menu.ogg")
return o
end
function Menu:delete() end