aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-04-24 16:59:09 -0700
committer1029chris <1029chris@gmail.com>2016-04-24 16:59:09 -0700
commitdfecc2551ed69ffe7a89349b6d1532192791d21e (patch)
treea45b1a72c2fa6063f2cd69031c51354f9eda3dcf
parenta90170e524d6f1c20c46029fcb4a963a1d2e0da2 (diff)
elements.lua stuff sets color to white after finished
changed 256 to 255 throught project
-rw-r--r--elements.lua3
-rw-r--r--panel.lua2
-rw-r--r--virus1.lua2
-rw-r--r--window.lua2
4 files changed, 6 insertions, 3 deletions
diff --git a/elements.lua b/elements.lua
index 1471e3e..ef75a54 100644
--- a/elements.lua
+++ b/elements.lua
@@ -29,6 +29,7 @@ function drawUpBox(x, y, w, h, t)
love.graphics.line(x, y+h, x, y, x+w, y)
love.graphics.setColor(colors.win.dark)
love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+ love.graphics.setColor(255,255,255)
end
function drawDownBox(x, y, w, h, t)
love.graphics.setColor(colors.win.normal)
@@ -38,6 +39,7 @@ function drawDownBox(x, y, w, h, t)
love.graphics.line(x, y+h, x, y, x+w, y)
love.graphics.setColor(colors.win.light)
love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+ love.graphics.setColor(255,255,255)
end
function drawBlueBox(x, y, w, h, t)
love.graphics.setColor(0, 0, 120)
@@ -47,6 +49,7 @@ function drawBlueBox(x, y, w, h, t)
love.graphics.line(x, y+h, x, y, x+w, y)
love.graphics.setColor(0, 0, 80)
love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+ love.graphics.setColor(255,255,255)
end
function drawBubble(x,y,w,h,m)
love.graphics.setColor(255,255,255)
diff --git a/panel.lua b/panel.lua
index cc0b427..226b393 100644
--- a/panel.lua
+++ b/panel.lua
@@ -8,7 +8,7 @@ function drawPanelButton(id)
end
love.graphics.setColor(70,70,70)
love.graphics.print(win[panel.b[id]].title, panel.s.x+4+90+(panel.s.dis*id-panel.s.dis), panel.s.y+7)
- love.graphics.setColor(256,256,256)
+ love.graphics.setColor(255,255,255)
love.graphics.draw(win[panel.b[id]].icon16, panel.s.x+4+72+(panel.s.dis*id-panel.s.dis), panel.s.y+2)
if (sys.mouse.p.p == true and sys.mouse.p.x >= panel.s.x+72+(panel.s.dis*id-panel.s.dis)
and sys.mouse.p.x <= (panel.s.x+72+(panel.s.dis*id-panel.s.dis))+(panel.s.width*2.75)
diff --git a/virus1.lua b/virus1.lua
index 76294c9..2a207e0 100644
--- a/virus1.lua
+++ b/virus1.lua
@@ -56,7 +56,7 @@ function drawVirusFight1()
end
love.graphics.setColor(colors.font.dark)
love.graphics.print("FIRE", win[4].x+138/2+76, win[4].y+99)
- love.graphics.setColor(256,256,256)
+ love.graphics.setColor(255,255,255)
drawDownBox(win[4].x+138/2+79-1, win[4].y+40-1, 42, 42, 2)
love.graphics.stencil(chargeStencil, "replace", 1)
love.graphics.setStencilTest("greater", 0)
diff --git a/window.lua b/window.lua
index a500ea6..c66ec81 100644
--- a/window.lua
+++ b/window.lua
@@ -2,7 +2,7 @@ function drawWindow(id)
if win[id].update == true then
love.graphics.setCanvas(win[id].cvs)
drawUpBox(0, 0, win[id].w, win[id].h, 4)
- love.graphics.setColor(256,256,256)
+ love.graphics.setColor(255,255,255)
if win[id].bar == "active" then
love.graphics.draw(window.bar, 0+3, 0+3, 0, (win[id].w-7)/643, 1)
else