Skip to content

Commit e29f651

Browse files
authored
freeroam: Fix warning when time is set to freeze (#229)
1 parent e869b3d commit e29f651

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

[gameplay]/freeroam/fr_client.lua

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ 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+
4348
-- Settings are stored in meta.xml
4449
function freeroamSettings(settings)
4550
if settings then
@@ -1820,6 +1825,7 @@ function applyTime()
18201825
local hours, minutes = getControlNumbers(wndTime, { 'hours', 'minutes' })
18211826
setTime(hours, minutes)
18221827
closeWindow(wndTime)
1828+
freezeTimeHour, freezeTimeMinute = hours, minutes
18231829
end
18241830

18251831
wndTime = {
@@ -1871,14 +1877,16 @@ addCommandHandler('st', setTimeCommand)
18711877
function toggleFreezeTime()
18721878
local state = guiCheckBoxGetSelected(getControl(wndMain, 'freezetime'))
18731879
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), not state)
1880+
freezeTimeHour, freezeTimeMinute = getTime()
1881+
freezeTimeWeather = getWeather()
18741882
setTimeFrozen(state)
18751883
end
18761884

1877-
function setTimeFrozen(state, h, m, w)
1885+
function setTimeFrozen(state)
18781886
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), state)
18791887
if state then
18801888
if not g_TimeFreezeTimer then
1881-
g_TimeFreezeTimer = setTimer(function() setTime(h, m) setWeather(w) end, 5000, 0)
1889+
g_TimeFreezeTimer = setTimer(function() setTime(freezeTimeHour, freezeTimeMinute) setWeather(freezeTimeWeather) end, 5000, 0)
18821890
setMinuteDuration(9001)
18831891
end
18841892
else
@@ -1902,6 +1910,7 @@ function applyWeather(leaf)
19021910
end
19031911
setWeather(leaf.id)
19041912
closeWindow(wndWeather)
1913+
freezeTimeWeather = leaf.id
19051914
end
19061915

19071916
wndWeather = {

0 commit comments

Comments
 (0)