Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Reverts the use of Set in f5336c42b8.

Browse Source 
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475

This was SVN commit r15773.
This commit is contained in:
Yves 2014-09-20 18:48:12 +00:00
parent f5336c42b8
commit a8d8c6d101
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binaries/data/mods/public/simulation/components/Timer.js
View File

@ -73,14 +73,16 @@ Timer.prototype.OnUpdate = function(msg)
// Collect the timers that need to run
// (We do this in two stages to avoid deleting from the timer list while
// we're in the middle of iterating through it)
var run = new Set();
var run = [];
for (let id of this.timers.keys())
{
if (this.timers.get(id)[3] <= this.time)
run.add(id);
run.push(id);
}
for (let id of run)
for (var i = 0; i < run.length; ++i)
{
var id = run[i];
var t = this.timers.get(id);
if (!t)
continue; // an earlier timer might have cancelled this one, so skip it
@ -108,7 +110,7 @@ Timer.prototype.OnUpdate = function(msg)
t[3] += t[4];
// Add it to the list to get re-executed if it's soon enough
if (t[3] <= this.time)
run.add(id);
run.push(id);
}
else
{