From 175f6de01b187a3197ed5d97d5085b2cdf489430 Mon Sep 17 00:00:00 2001
From: Song Minjae <alswo9628@gmail.com>
Date: Fri, 17 Jun 2016 01:49:19 +0900
Subject: [PATCH] torches' flicker time is now determined by FPS to get same
 speed from alternating frame rate

Former-commit-id: c88c54f7613f8f3bbc3b89153ca30400b2a124ac
Former-commit-id: 505ebdaf930f257e1a2521a5b07b65843e56a201
---
 src/net/torvald/terrarum/tileproperties/TilePropUtil.kt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt b/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt
index fe5d3957e..bee452b1e 100644
--- a/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt
+++ b/src/net/torvald/terrarum/tileproperties/TilePropUtil.kt
@@ -10,7 +10,7 @@ import net.torvald.terrarum.mapdrawer.LightmapRenderer
  */
 object TilePropUtil {
     var flickerFuncX = 0 // in milliseconds; saves current status of func
-    val flickerFuncDomain = 50 // time between two noise sample, in milliseconds
+    val flickerFuncDomain = 100 // time between two noise sample, in milliseconds
     val flickerFuncRange = 0.012f // intensity [0, 1]
     //val torchIntensityOffset = -0.04f
 
@@ -33,7 +33,8 @@ object TilePropUtil {
     }
 
     fun torchFlickerTickClock() {
-        flickerFuncX += Terrarum.game.DELTA_T
+        if (Terrarum.appgc.fps > 0)
+            flickerFuncX += 1000 / Terrarum.appgc.fps
 
         if (flickerFuncX > flickerFuncDomain) {
             flickerFuncX -= flickerFuncDomain