Skip to content

Commit b40f27b

Browse files
freeroam: fix freezetime flickering #529 (#530)
* fix freezetime flickering #529 remove redundant timer and its 3 variables * remove redundant toggle code
1 parent 80d98fd commit b40f27b

File tree

1 file changed

+1
-23
lines changed

1 file changed

+1
-23
lines changed

[gameplay]/freeroam/fr_client.lua

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ if not (g_PlayerData) then
4040
g_PlayerData = {}
4141
end
4242

43-
-- Variables for time freeze
44-
local freezeTimeHour = false
45-
local freezeTimeMinute = false
46-
local freezeTimeWeather = false
47-
4843
-- Settings are stored in meta.xml
4944
function freeroamSettings(settings)
5045
if settings then
@@ -1853,7 +1848,6 @@ function applyTime()
18531848
local hours, minutes = getControlNumbers(wndTime, { 'hours', 'minutes' })
18541849
setTime(hours, minutes)
18551850
closeWindow(wndTime)
1856-
freezeTimeHour, freezeTimeMinute = hours, minutes
18571851
end
18581852

18591853
wndTime = {
@@ -1905,25 +1899,10 @@ addCommandHandler('st', setTimeCommand)
19051899

19061900
function toggleFreezeTime()
19071901
local state = guiCheckBoxGetSelected(getControl(wndMain, 'freezetime'))
1908-
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), not state)
1909-
freezeTimeHour, freezeTimeMinute = getTime()
1910-
freezeTimeWeather = getWeather()
1911-
setTimeFrozen(state)
1912-
end
1913-
1914-
function setTimeFrozen(state)
1915-
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), state)
19161902

19171903
if state then
1918-
if not g_TimeFreezeTimer then
1919-
g_TimeFreezeTimer = setTimer(function() setTime(freezeTimeHour, freezeTimeMinute) setWeather(freezeTimeWeather) end, 5000, 0)
1920-
setMinuteDuration(9001)
1921-
end
1904+
setMinuteDuration(2147483647)
19221905
else
1923-
if g_TimeFreezeTimer then
1924-
killTimer(g_TimeFreezeTimer)
1925-
g_TimeFreezeTimer = nil
1926-
end
19271906
setMinuteDuration(1000)
19281907
end
19291908
end
@@ -1940,7 +1919,6 @@ function applyWeather(leaf)
19401919
end
19411920
setWeather(leaf.id)
19421921
closeWindow(wndWeather)
1943-
freezeTimeWeather = leaf.id
19441922
end
19451923

19461924
wndWeather = {

0 commit comments

Comments
 (0)