aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-05-18 09:14:19 -0700
committer1029chris <1029chris@gmail.com>2016-05-18 09:14:19 -0700
commit30e3c4eb01e1f764113bc3110a48569caea14bb7 (patch)
treedf75c62b2b810e4822708d033ed887fb654908ad
parent9eb7db20544287439f1b0b4b648bd69af06a61b5 (diff)
Some tweaks
-rw-r--r--assets/cursor.pngbin0 -> 274 bytes
-rw-r--r--main.lua10
-rw-r--r--var.lua10
3 files changed, 11 insertions, 9 deletions
diff --git a/assets/cursor.png b/assets/cursor.png
new file mode 100644
index 0000000..60de7c1
--- /dev/null
+++ b/assets/cursor.png
Binary files differ
diff --git a/main.lua b/main.lua
index 630627c..a5a116f 100644
--- a/main.lua
+++ b/main.lua
@@ -16,9 +16,6 @@ function love.load()
require "virus1"
require "dialogue"
loadPre()
- --loadAssets()
- --loadVar()
- --loadDia()
end
function love.update(dt)
delta = dt
@@ -67,7 +64,12 @@ end
function love.mousepressed(x, y, button)
sys.mouse.p.x = x
sys.mouse.p.y = y
- sys.mouse.p.p = true
+ if button == 2 then
+ sys.mouse.p.p = false
+ end
+ if button == 1 then
+ sys.mouse.p.p = true
+ end
end
function love.keyreleased(key)
if key == "f11" then
diff --git a/var.lua b/var.lua
index 281c1f2..f670091 100644
--- a/var.lua
+++ b/var.lua
@@ -203,11 +203,11 @@ function loadVar()
std[6].title = "Impossible"
std[6].hl = false
files = {}
- files[1] = {name="Documents",type=0,content={},x=0,y=0}
- files[2] = {name="Downloads",type=0,content={},x=0,y=0}
- files[3] = {name="Music",type=0,content={},x=0,y=0}
- files[4] = {name="Pictures",type=0,content={},x=0,y=0}
- files[5] = {name="Videos",type=0,content={},x=0,y=0}
+ files[1] = {name="Documents",type=0,content={},x=0,y=0,hl=false}
+ files[2] = {name="Downloads",type=0,content={},x=0,y=0,hl=false}
+ files[3] = {name="Music",type=0,content={},x=0,y=0,hl=false}
+ files[4] = {name="Pictures",type=0,content={},x=0,y=0,hl=false}
+ files[5] = {name="Videos",type=0,content={},x=0,y=0,hl=false}
end
function loadPre()
love.graphics.setDefaultFilter("nearest", "nearest")