Skip to content

freeroam: fix freezetime flickering #529 #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2024
Merged

freeroam: fix freezetime flickering #529 #530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c41c79
fix freezetime flickering #529
ricksterhd123 Aug 1, 2024
da2223c
remove redundant toggle code
ricksterhd123 Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions [gameplay]/freeroam/fr_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ if not (g_PlayerData) then
g_PlayerData = {}
end

-- Variables for time freeze
local freezeTimeHour = false
local freezeTimeMinute = false
local freezeTimeWeather = false

-- Settings are stored in meta.xml
function freeroamSettings(settings)
if settings then
Expand Down Expand Up @@ -1853,7 +1848,6 @@ function applyTime()
local hours, minutes = getControlNumbers(wndTime, { 'hours', 'minutes' })
setTime(hours, minutes)
closeWindow(wndTime)
freezeTimeHour, freezeTimeMinute = hours, minutes
end

wndTime = {
Expand Down Expand Up @@ -1905,25 +1899,10 @@ addCommandHandler('st', setTimeCommand)

function toggleFreezeTime()
local state = guiCheckBoxGetSelected(getControl(wndMain, 'freezetime'))
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), not state)
freezeTimeHour, freezeTimeMinute = getTime()
freezeTimeWeather = getWeather()
setTimeFrozen(state)
end

function setTimeFrozen(state)
guiCheckBoxSetSelected(getControl(wndMain, 'freezetime'), state)

if state then
if not g_TimeFreezeTimer then
g_TimeFreezeTimer = setTimer(function() setTime(freezeTimeHour, freezeTimeMinute) setWeather(freezeTimeWeather) end, 5000, 0)
setMinuteDuration(9001)
end
setMinuteDuration(2147483647)
else
if g_TimeFreezeTimer then
killTimer(g_TimeFreezeTimer)
g_TimeFreezeTimer = nil
end
setMinuteDuration(1000)
end
end
Expand All @@ -1940,7 +1919,6 @@ function applyWeather(leaf)
end
setWeather(leaf.id)
closeWindow(wndWeather)
freezeTimeWeather = leaf.id
end

wndWeather = {
Expand Down