Ticket #2475: timer.diff

binaries/data/mods/public/simulation/components/Timer.js

@@ -7 +7 @@
 {
     this.id = 0;
     this.time = 0;
-    this.timers = {};
+    this.timers = new Map();
 };
 
+Timer.prototype.Serialize = function()
+{
+    var r = {};
+    r.id = this.id;
+    r.time = this.time;
+    r.timers = [];
+    for (var t of this.timers.entries())
+        r.timers.push(t);
+    print(uneval(r));
+    return r;
+};
+
+Timer.prototype.Deserialize = function(data)
+{
+    this.id = data.id
+    this.time = data.time;
+    this.timers = new Map(data.timers);
+};
+
 /**
  * Returns time since the start of the game, in integer milliseconds.
  */
@@ -27 +46 @@
 Timer.prototype.SetTimeout = function(ent, iid, funcname, time, data)
 {
     var id = ++this.id;
-    this.timers[id] = [ent, iid, funcname, this.time + time, 0, data];
+    this.timers.set(id, [ent, iid, funcname, this.time + time, 0, data]);
     return id;
 };
 
@@ -45 +64 @@
     if (typeof repeattime != "number" || !(repeattime > 0))
         error("Invalid repeattime to SetInterval of "+funcname);
     var id = ++this.id;
-    this.timers[id] = [ent, iid, funcname, this.time + time, repeattime, data];
+    this.timers.set(id, [ent, iid, funcname, this.time + time, repeattime, data]);
     return id;
 };
 
@@ -54 +73 @@
  */
 Timer.prototype.CancelTimer = function(id)
 {
-    delete this.timers[id];
+    this.timers.delete(id);
 };
 
 
@@ -66 +85 @@
     // 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 = [];
-    for (var id in this.timers)
+    var run = new Set();
+    for (let id of this.timers.keys())
     {
-        if (this.timers[id][3] <= this.time)
-            run.push(id);
+        if (this.timers.get(id)[3] <= this.time)
+            run.add(id);
     }
-    for (var i = 0; i < run.length; ++i)
+    for (let id of run)
     {
-        var id = run[i];
-
-        var t = this.timers[id];
+        var t = this.timers.get(id);
         if (!t)
             continue; // an earlier timer might have cancelled this one, so skip it
 
@@ -84 +101 @@
         if (!cmp)
         {
             // The entity was probably destroyed; clean up the timer
-            delete this.timers[id];
+            this.timers.delete(id);
             continue;
         }
 
@@ -103 +120 @@
             t[3] += t[4];
             // Add it to the list to get re-executed if it's soon enough
             if (t[3] <= this.time)
-                run.push(id);
+                run.add(id);
         }
         else
         {
             // Non-repeating time - delete it
-            delete this.timers[id];
+            this.timers.delete(id);
         }
     }
 }