aboutsummaryrefslogtreecommitdiff
path: root/main.lua
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-02-25 13:36:59 -0800
committer1029chris <1029chris@gmail.com>2016-02-25 13:36:59 -0800
commitb9e1d407a9c8cf994497782ef9b988e65ba96550 (patch)
tree9643e1e81ee3e80f67ba93464efb3857422c3b7f /main.lua
parent70757a0c4a2ad0fb55b2fc0f9b10ba684d16a207 (diff)
Moved assets to assets.lua
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua2
1 files changed, 2 insertions, 0 deletions
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)