diff options
| author | 1029chris <1029chris@gmail.com> | 2016-11-11 22:19:19 -0800 |
|---|---|---|
| committer | 1029chris <1029chris@gmail.com> | 2016-11-11 22:19:19 -0800 |
| commit | 127446e6f22b479abf1935f04739104288504b51 (patch) | |
| tree | 763c729668720a0864fe80f33d63fb47a03d0920 /desktop.lua | |
| parent | 3f6ab76337da9e387035cbd23de8abcbd51c87ef (diff) | |
Fixed a couple bugs, adjusted dialogue
Diffstat (limited to 'desktop.lua')
| -rw-r--r-- | desktop.lua | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/desktop.lua b/desktop.lua index 63ea467..081363f 100644 --- a/desktop.lua +++ b/desktop.lua @@ -78,11 +78,18 @@ function drawIcon(id, x, y) end function checkIcon(id) if(sys.mouse.p.x >= icon[id].x+4 and sys.mouse.p.x <= icon[id].x+100 and sys.mouse.p.p == true - and sys.mouse.p.y >= icon[id].y and sys.mouse.p.y <= icon[id].y+75 and v1.yes == false and v2.start == false) then - if icon[id].hl == false and icon[id].cl == false then + and sys.mouse.p.y >= icon[id].y and sys.mouse.p.y <= icon[id].y+75 and v1.yes == false) then + local click = true + if v2.start == true then + if v2.c.chat.msgs == 17 or v2.c.chat.msgs == 18 and id == 4 and scene == 3 then + else + click = false + end + end + if icon[id].hl == false and icon[id].cl == false and click == true then icon[id].hl = true icon[id].cl = true - elseif icon[id].hl == true and icon[id].cl == false then + elseif icon[id].hl == true and icon[id].cl == false and click == true then icon[id].hl = false icon[id].cl = true if win[id].ex == true then @@ -90,7 +97,7 @@ function checkIcon(id) win[id].s = 0.2 win[id].oldlayer = win[id].layer layer.sentToFront = id - else + elseif v2.start == false and win[id].ex == false then win[id].oldlayer = win[id].layer layer.sentToFront = id end |