aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-06-14 14:39:42 -0700
committer1029chris <1029chris@gmail.com>2016-06-14 14:39:42 -0700
commit138318b6bf5b2213338c8b9dc2e7104a0b41efa9 (patch)
treec51f926b6ec5c4b7b6b77bef3d468bc8eee2695f
parent6634f6d599d1197766742f90af72893b5cdf5bea (diff)
Added new image file to see
-rw-r--r--assets.lua3
-rw-r--r--assets/art.jpgbin0 -> 5469 bytes
-rw-r--r--files.lua3
-rw-r--r--var.lua2
4 files changed, 6 insertions, 2 deletions
diff --git a/assets.lua b/assets.lua
index 6094758..0ee8a61 100644
--- a/assets.lua
+++ b/assets.lua
@@ -100,7 +100,8 @@ function loadAssets(id)
comp = love.graphics.newImage("assets/computer.png")
}
picture = {
- cat = love.graphics.newImage("assets/cat.jpg")
+ cat = love.graphics.newImage("assets/cat.jpg"),
+ art = love.graphics.newImage("assets/art.jpg")
}
but = {
play = love.graphics.newImage("assets/button_play.png"),
diff --git a/assets/art.jpg b/assets/art.jpg
new file mode 100644
index 0000000..a168f92
--- /dev/null
+++ b/assets/art.jpg
Binary files differ
diff --git a/files.lua b/files.lua
index 40046e9..fd5542e 100644
--- a/files.lua
+++ b/files.lua
@@ -81,6 +81,9 @@ function updateFiles()
if i == 1 and picture.img ~= picture.cat then
picture.img = picture.cat
win[7].update = true
+ elseif i == 2 and picture.img ~= picture.art then
+ picture.img = picture.art
+ win[7].update = true
end
openFileWindow(7)
elseif files == f.videos then
diff --git a/var.lua b/var.lua
index def6b2d..593032e 100644
--- a/var.lua
+++ b/var.lua
@@ -229,7 +229,7 @@ function loadVar()
f.home[5] = {name="Videos",x=0,y=0,hl=false}
f.pictures = {}
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.pictures[2] = {name="art.jpg",x=0,y=0,hl=false}
f.documents = {}
f.music = {}
f.music[1] = {name="chill.mp3",x=0,y=0,hl=false}