aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets.lua21
-rw-r--r--main.lua2
-rw-r--r--var.lua18
3 files changed, 23 insertions, 18 deletions
diff --git a/assets.lua b/assets.lua
new file mode 100644
index 0000000..72bb8eb
--- /dev/null
+++ b/assets.lua
@@ -0,0 +1,21 @@
+function loadAssets()
+ icons = {}
+ icons[32] = {
+ chat = love.graphics.newImage("assets/icon_32_chat.png"),
+ internet = love.graphics.newImage("assets/icon_32_internet.png"),
+ files = love.graphics.newImage("assets/icon_32_files.png"),
+ file = love.graphics.newImage("assets/icon_32_file.png"),
+ help = love.graphics.newImage("assets/icon_32_help.png"),
+ torrentr = love.graphics.newImage("assets/icon_32_torrentr.png"),
+ settings = love.graphics.newImage("assets/icon_32_settings.png")
+ }
+ desktop = {}
+ desktop.bg = {
+ hills = love.graphics.newImage("assets/bg_hills.jpg"),
+ coast = love.graphics.newImage("assets/bg_coast.jpg"),
+ cloud = love.graphics.newImage("assets/bg_cloud.jpg"),
+ flower = love.graphics.newImage("assets/bg_flower.jpg"),
+ city = love.graphics.newImage("assets/bg_city.jpg")
+ }
+ music = {}
+end
diff --git a/main.lua b/main.lua
index 3aa4fe7..1f223d5 100644
--- a/main.lua
+++ b/main.lua
@@ -1,4 +1,5 @@
function love.load()
+ require "assets"
require "window"
require "panel"
require "startmenu"
@@ -18,6 +19,7 @@ function love.load()
pressstart = love.graphics.newFont("fonts/pressstart.ttf", 12)
pressstart:setFilter("nearest", "nearest")
love.graphics.setFont(pressstart)
+ loadAssets()
loadVar()
end
function love.update(dt)
diff --git a/var.lua b/var.lua
index a588caf..523308a 100644
--- a/var.lua
+++ b/var.lua
@@ -1,14 +1,4 @@
function loadVar()
- icons = {}
- icons[32] = {
- chat = love.graphics.newImage("assets/icon_32_chat.png"),
- internet = love.graphics.newImage("assets/icon_32_internet.png"),
- files = love.graphics.newImage("assets/icon_32_files.png"),
- file = love.graphics.newImage("assets/icon_32_file.png"),
- help = love.graphics.newImage("assets/icon_32_help.png"),
- torrentr = love.graphics.newImage("assets/icon_32_torrentr.png"),
- settings = love.graphics.newImage("assets/icon_32_settings.png")
- }
sys = {}
sys.width = love.graphics.getWidth()
sys.height = love.graphics.getHeight()
@@ -180,14 +170,6 @@ function loadVar()
layer[5] = 0
layer[6] = 0
layer[7] = 0
- desktop = {}
- desktop.bg = {
- hills = love.graphics.newImage("assets/bg_hills.jpg"),
- coast = love.graphics.newImage("assets/bg_coast.jpg"),
- cloud = love.graphics.newImage("assets/bg_cloud.jpg"),
- flower = love.graphics.newImage("assets/bg_flower.jpg"),
- city = love.graphics.newImage("assets/bg_city.jpg")
- }
desktop.bg.current = 0
fade = 0
fadeOpacity = 0