aboutsummaryrefslogtreecommitdiff
path: root/main.lua
diff options
context:
space:
mode:
authorChris B <1029chris@gmail.com>2016-01-22 12:44:35 -0800
committerChris B <1029chris@gmail.com>2016-01-22 12:44:35 -0800
commit26fb986f74358281da87c38e0706a3c078b11ec8 (patch)
tree7b03048f386dd67c4bf7070ea60566795644e884 /main.lua
parentb6021f847358ca9d5cefc233e285170739e4035e (diff)
Added internet icon, start menu launches chat
Diffstat (limited to 'main.lua')
-rw-r--r--main.lua12
1 files changed, 5 insertions, 7 deletions
diff --git a/main.lua b/main.lua
index 22715e7..c7b3429 100644
--- a/main.lua
+++ b/main.lua
@@ -3,8 +3,10 @@ function love.load()
require "panel"
require "startmenu"
love.graphics.setDefaultFilter("nearest", "nearest")
- icons = {
- chat = love.graphics.newImage("assets/icon_chat.png")
+ icons = {}
+ icons[32] = {
+ chat = love.graphics.newImage("assets/icon_32_chat.png"),
+ internet = love.graphics.newImage("assets/icon_32_internet.png")
}
sys = {}
sys.width = love.graphics.getWidth()
@@ -46,7 +48,7 @@ function love.load()
win[1].ex = true
win[1].cvs = love.graphics.newCanvas(win[1].w, win[1].h)
win[1].fd = false
- win[1].s = 1
+ win[1].s = 0
win[1].min = false
win[1].miny = 0
start = {}
@@ -60,10 +62,6 @@ function love.update(dt)
if love.keyboard.isDown("escape") == true then
love.event.quit()
end
- if love.keyboard.isDown("c") == true and win[1].ex == true then
- win[1].ex = false
- win[1].s = 0.2
- end
if love.keyboard.isDown("u") == true and win[1].min == true then
win[1].min = false
end