aboutsummaryrefslogtreecommitdiff
path: root/loading.lua
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-05-03 18:10:18 -0700
committer1029chris <1029chris@gmail.com>2016-05-03 18:10:18 -0700
commit8c831056c9e5f22e504f9d7e57b7fe35b17cc617 (patch)
tree8469d79fb193b2af464460e7eadbc854fd9877ee /loading.lua
parent48b794b936f987b0283342ca385d77b5b8ec95f9 (diff)
Implimented new loading system
webpages now load
Diffstat (limited to 'loading.lua')
-rw-r--r--loading.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/loading.lua b/loading.lua
index d88f4c9..de67665 100644
--- a/loading.lua
+++ b/loading.lua
@@ -7,7 +7,11 @@ function drawLoading()
love.graphics.setColor(0,0,120)
love.graphics.rectangle("fill", sys.w/2-125+5, sys.h/2-10, loading, 20)
if loading < 240 then
- loading = loading + math.random(0.1,2)
+ loading = loading + 5
+ if loading > loadingId*10 and loaded == false then
+ loadAssets(loadingId)
+ loadingId = loadingId + 1
+ end
elseif loading >= 240 then
loading = 240
fade = 1
@@ -20,3 +24,5 @@ function drawLoading()
sound.boot:play()
end
end
+function drawBSOD()
+end