From c805934fb03808baeb688d3f629701b171b38873 Mon Sep 17 00:00:00 2001
From: 1029chris <1029chris@gmail.com>
Date: Fri, 10 Jun 2016 13:10:41 -0700
Subject: Made window open animation more smooth Adjusted animation speed
 setting

---
 assets.lua | 3 +--
 window.lua | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets.lua b/assets.lua
index caabdd8..6094758 100644
--- a/assets.lua
+++ b/assets.lua
@@ -261,11 +261,10 @@ function loadAnimation(pic, quad, frames, limit, w, h)
 end
 function playAnimation(ani, loop, x, y, r, s, xo, yo, sp)
   love.graphics.draw(ani.pic, ani.fs[math.floor(ani.f)], x, y, r, s, s, xo, yo)
-  speed = (60/love.timer.getFPS())*sp
   if loop == true and #ani.fs <= ani.f then
     ani.f = 1
   elseif loop == false and ani.f >= #ani.fs then
   else
-    ani.f = ani.f + speed
+    ani.f = ani.f + sys.s*sp
   end
 end
diff --git a/window.lua b/window.lua
index 3122240..a0afc7a 100644
--- a/window.lua
+++ b/window.lua
@@ -121,9 +121,9 @@ function drawWindow(id)
     win[id].ex = true
   end
   if win[id].ex == true and win[id].s ~= 0 then
-    win[id].s = win[id].s - 0.2*sys.s
+    win[id].s = win[id].s - (0.4*win[id].s)*sys.s
   elseif win[id].ex == false and win[id].s ~= 0 then
-    win[id].s = win[id].s + 0.2*sys.s
+    win[id].s = win[id].s + (0.075/win[id].s)*sys.s
   end
   if win[id].s > 1 then
     win[id].s = 1
-- 
cgit