From e8e4af62cad224bdb028ffcf730d7c5c8c2b7482 Mon Sep 17 00:00:00 2001 From: 1029chris <1029chris@gmail.com> Date: Thu, 9 Jun 2016 13:50:25 -0700 Subject: Changed some variables sys.width and sys.height removed love.graphics.getHeight changed to sys.h, same with width --- main.lua | 2 +- panel.lua | 6 +++--- var.lua | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/main.lua b/main.lua index 182f9b2..7c44244 100644 --- a/main.lua +++ b/main.lua @@ -25,7 +25,7 @@ function love.update(dt) sys.s = 60/fps sys.w = love.graphics.getWidth() sys.h = love.graphics.getHeight() - minim = love.graphics.getHeight()+10 + minim = sys.h+10 sys.mouse.x = love.mouse.getX() sys.mouse.y = love.mouse.getY() if love.keyboard.isDown("escape") == true then diff --git a/panel.lua b/panel.lua index 0ba0687..6a36e23 100644 --- a/panel.lua +++ b/panel.lua @@ -24,8 +24,8 @@ function drawPanelButton(id) end end function drawStart() - panel.width = love.graphics.getWidth() - panel.y = love.graphics.getHeight() + panel.width = sys.w + panel.y = sys.h panel.y = panel.y - panel.thick panel.s.y = panel.y + 5 love.graphics.setColor(colors.win.normal) @@ -125,7 +125,7 @@ function drawMenuItems(id) love.graphics.setColor(colors.win.normal) end function drawMenu() - start.y = love.graphics.getHeight() + start.y = sys.h start.y = start.y-30-350+2 love.graphics.setCanvas(start.cvs) love.graphics.setColor(192, 192, 192) diff --git a/var.lua b/var.lua index 6ee9bab..6e69fea 100644 --- a/var.lua +++ b/var.lua @@ -40,7 +40,7 @@ function loadVar() panel.thick = 30 panel.x = 0 panel.y = 600-panel.thick - panel.width = sys.width + panel.width = sys.w panel.height = panel.thick panel.s = {} panel.s.x = panel.x + 5 @@ -70,7 +70,7 @@ function loadVar() end winOpen = true winHover = false - minim = love.graphics.getHeight()+10 + minim = sys.h+10 start = {} start.cvs = love.graphics.newCanvas(250, 350) start.o = false @@ -292,8 +292,6 @@ function loadPre() fadeOpacity = 0 sys = {} sys.s = 0 - sys.width = love.graphics.getWidth() - sys.height = love.graphics.getHeight() sys.mouse = {} sys.mouse.p = {} sys.mouse.x = love.mouse.getX -- cgit