From 93916b2dbc006735c533a285a77f4dbc178a4c71 Mon Sep 17 00:00:00 2001 From: 1029chris <1029chris@gmail.com> Date: Thu, 2 Jun 2016 14:47:24 -0700 Subject: Removed file type variable, it wasn't used. --- files.lua | 66 +++++++++++++++++++++++++++++++-------------------------------- var.lua | 22 ++++++++++----------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/files.lua b/files.lua index df4cb27..370f5b1 100644 --- a/files.lua +++ b/files.lua @@ -15,41 +15,39 @@ function drawFiles() love.graphics.setColor(colors.font.dark) love.graphics.print(file.title, 70, 44) for i=1,#files do - if files[i].type == 0 then - files[i].x = 40 - if i < 6 then - files[i].y = 80 - files[i].x = (i*80)-43 - elseif i >= 6 then - files[i].y = 150 - files[i].x = ((i-5)*80)-43 - end - love.graphics.setFont(pixeloperators) - love.graphics.setColor(256,256,256) - if f.home == files then - love.graphics.draw(icons[32].file,files[i].x,files[i].y,0,1.5,1.5) - elseif files == f.pictures then - love.graphics.draw(icons[48].imageFile,files[i].x,files[i].y,0,1,1) - elseif files == f.videos then - love.graphics.draw(icons[48].videoFile,files[i].x,files[i].y,0,1,1) - elseif files == f.music then - love.graphics.draw(icons[48].musicFile,files[i].x,files[i].y,0,1,1) - elseif files == f.downloads then - love.graphics.draw(icons[48].downloadFile,files[i].x,files[i].y,0,1,1) - elseif files == f.documents then - love.graphics.draw(icons[48].documentFile,files[i].x,files[i].y,0,1,1) - end - if files[i].hl == true then - love.graphics.setColor(0,0,120) - love.graphics.rectangle("fill", files[i].x-13,files[i].y+48,75,20) - love.graphics.setColor(colors.font.light) - love.graphics.printf(files[i].name,files[i].x-13,files[i].y+48,75,"center") - else - love.graphics.setColor(colors.font.dark) - love.graphics.printf(files[i].name,files[i].x-13,files[i].y+48,75,"center") - end - love.graphics.setFont(pressstart) + files[i].x = 40 + if i < 6 then + files[i].y = 80 + files[i].x = (i*80)-43 + elseif i >= 6 then + files[i].y = 150 + files[i].x = ((i-5)*80)-43 + end + love.graphics.setFont(pixeloperators) + love.graphics.setColor(256,256,256) + if f.home == files then + love.graphics.draw(icons[32].file,files[i].x,files[i].y,0,1.5,1.5) + elseif files == f.pictures then + love.graphics.draw(icons[48].imageFile,files[i].x,files[i].y,0,1,1) + elseif files == f.videos then + love.graphics.draw(icons[48].videoFile,files[i].x,files[i].y,0,1,1) + elseif files == f.music then + love.graphics.draw(icons[48].musicFile,files[i].x,files[i].y,0,1,1) + elseif files == f.downloads then + love.graphics.draw(icons[48].downloadFile,files[i].x,files[i].y,0,1,1) + elseif files == f.documents then + love.graphics.draw(icons[48].documentFile,files[i].x,files[i].y,0,1,1) + end + if files[i].hl == true then + love.graphics.setColor(0,0,120) + love.graphics.rectangle("fill", files[i].x-13,files[i].y+48,75,20) + love.graphics.setColor(colors.font.light) + love.graphics.printf(files[i].name,files[i].x-13,files[i].y+48,75,"center") + else + love.graphics.setColor(colors.font.dark) + love.graphics.printf(files[i].name,files[i].x-13,files[i].y+48,75,"center") end + love.graphics.setFont(pressstart) end end function updateFiles() diff --git a/var.lua b/var.lua index 01bef19..d4f85b8 100644 --- a/var.lua +++ b/var.lua @@ -226,21 +226,21 @@ function loadVar() stre[6].hl = false f = {} f.home = {} - f.home[1] = {name="Documents",type=0,x=0,y=0,hl=false} - f.home[2] = {name="Downloads",type=0,x=0,y=0,hl=false} - f.home[3] = {name="Music",type=0,x=0,y=0,hl=false} - f.home[4] = {name="Pictures",type=0,x=0,y=0,hl=false} - f.home[5] = {name="Videos",type=0,x=0,y=0,hl=false} + f.home[1] = {name="Documents",x=0,y=0,hl=false} + f.home[2] = {name="Downloads",x=0,y=0,hl=false} + f.home[3] = {name="Music",x=0,y=0,hl=false} + f.home[4] = {name="Pictures",x=0,y=0,hl=false} + f.home[5] = {name="Videos",x=0,y=0,hl=false} f.pictures = {} - f.pictures[1] = {name="cat.jpg",type=0,x=0,y=0,hl=false} - f.pictures[2] = {name="meme.png",type=0,x=0,y=0,hl=false} + f.pictures[1] = {name="cat.jpg",x=0,y=0,hl=false} + f.pictures[2] = {name="meme.png",x=0,y=0,hl=false} f.documents = {} f.music = {} - f.music[1] = {name="chill.mp3",type=0,x=0,y=0,hl=false} - f.music[2] = {name="rage.mp3",type=0,x=0,y=0,hl=false} + f.music[1] = {name="chill.mp3",x=0,y=0,hl=false} + f.music[2] = {name="rage.mp3",x=0,y=0,hl=false} f.videos = {} - f.videos[1] = {name="wtf.avi",type=0,x=0,y=0,hl=false} - f.videos[2] = {name="lol.avi",type=0,x=0,y=0,hl=false} + f.videos[1] = {name="wtf.avi",x=0,y=0,hl=false} + f.videos[2] = {name="lol.avi",x=0,y=0,hl=false} f.downloads = {} files = f.home file = {} -- cgit