Skip to content

Commit b1d2d40

Browse files
Hdt80brolL1l1
andauthored
Simplify defeat backend (#6965)
Co-authored-by: lL1l1 <82986251+lL1l1@users.noreply.github.com>
1 parent 4dd9fdb commit b1d2d40

File tree

8 files changed

+584
-538
lines changed

8 files changed

+584
-538
lines changed

changelog/snippets/fix.6965.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- (#6965) Refactored defeat backend so now unit transfering is handled the same in all scenarios.

changelog/snippets/fix.6985.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- (#6985) Fix profiler benchmarking potentially sending unserializable data from Sim to UI.

engine/Sim.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ end
620620

621621
--- Gets the current game time in ticks.
622622
--- The game time is the simulation time, that stops when the game is paused.
623-
---@return number
623+
---@return integer
624624
function GetGameTick()
625625
end
626626

lua/SimSync.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function FloatingEntityText(entityId, text)
167167
end
168168

169169
function StartCountdown(entityId, duration)
170-
cdDuration = duration or 5
170+
local cdDuration = duration or 5
171171
if not entityId then
172172
WARN('Trying to start countdown text with no entityId.')
173173
return false

0 commit comments

Comments
 (0)