Skip to content
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

Fix lambda timers timerSetDelay not accounting for repetitions. #3226

Merged
merged 4 commits into from
Dec 27, 2024
Merged

Fix lambda timers timerSetDelay not accounting for repetitions. #3226

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ec9932
Add entity:parentToAttachment()
unknao Jul 28, 2024
e9fe870
Fix design oversight on timerSetDelay.
unknao Dec 24, 2024
1de2ec0
Merge branch 'master' of https://github.com/unknao/wire
unknao Dec 24, 2024
a722a5e
removed unnecessary logic
unknao Dec 25, 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
14 changes: 12 additions & 2 deletions lua/entities/gmod_wire_expression2/core/timer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ local luaTimers = {
delay = 1,
repetitions = 1
}
}
}
*/
}

Expand Down Expand Up @@ -244,8 +244,18 @@ e2function void timerSetDelay(string name, number delay)
end

local entIndex = self.entity:EntIndex()
local internalName = luaTimerGetInternalName(entIndex, name)
luaTimers[entIndex][name].delay = delay
timer.Adjust(luaTimerGetInternalName(entIndex, name), delay, 0)

if luaTimers[entIndex][name].repetitions > 0 then
local repsLeft = timer.RepsLeft(internalName)
if repsLeft == 0 then return end

luaTimers[entIndex][name].repetitions = repsLeft
timer.Adjust(internalName, delay, repsLeft)
return
end
timer.Adjust(internalName, delay, 0)
end

e2function number timerSetReps(string name, number repetitions)
Expand Down
Loading