aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-06-10 12:49:44 -0700
committer1029chris <1029chris@gmail.com>2016-06-10 12:49:44 -0700
commit362f88cea6ea719d264b8c97f591df28c19d71a4 (patch)
treec357039e5bfa97ad40fcface8564a0a3a99dca13
parentc770c88f981ec37a0db43ef8f6427d60c019b52f (diff)
Fixed crazy mode not working
-rw-r--r--window.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/window.lua b/window.lua
index 150ee0c..3122240 100644
--- a/window.lua
+++ b/window.lua
@@ -136,34 +136,34 @@ function drawWindow(id)
win[id].min = true
end
if win[id].min == true and win[id].miny < minim then
- win[id].y = win[id].y + 150
- win[id].miny = win[id].miny + 150
+ win[id].y = win[id].y + 150*sys.s
+ win[id].miny = win[id].miny + 150*sys.s
end
if win[id].miny > minim then
win[id].miny = minim
end
if win[id].min == false and win[id].miny > 0 then
- win[id].y = win[id].y - 150
- win[id].miny = win[id].miny - 150
+ win[id].y = win[id].y - 150*sys.s
+ win[id].miny = win[id].miny - 150*sys.s
end
if win[id].miny < 0 then
win[id].miny = 0
end
if id == 4 and win[4].crazy == true then
if win[4].crazyLeft == true and win[4].x >= 100 then
- win[4].x = win[4].x - 10+v1.spm
+ win[4].x = win[4].x - 10+v1.spm*sys.s
elseif win[4].crazyLeft == false and win[4].x <= sys.w-300 then
- win[4].x = win[4].x + 10+v1.spm
+ win[4].x = win[4].x + 10+v1.spm*sys.s
end
- if win[4].x <= 100 then
+ if win[4].x <= 150 then
win[4].crazyLeft = false
- elseif win[4].x >= sys.w-300 then
+ elseif win[4].x >= sys.w-350 then
win[4].crazyLeft = true
end
if win[4].crazyUp == true and win[4].y >= sys.h/2+50 then
- win[4].y = win[4].y - 6+v1.spm
+ win[4].y = win[4].y - 6+v1.spm*sys.s
elseif win[4].crazyUp == false and win[4].y <= sys.h-panel.thick-200 then
- win[4].y = win[4].y + 6+v1.spm
+ win[4].y = win[4].y + 6+v1.spm*sys.s
end
if win[4].y <= sys.h/2+50 then
win[4].crazyUp = false