From 59f1cdfc184484212c2d5b09fc3ec06c42622950 Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Tue, 2 Feb 2016 16:18:33 -0800 Subject: [PATCH] Reinit bestPromise with each proposal. --- examples/libraries/{virtualBaton.25.js => virtualBaton.27.js} | 4 +--- examples/tests/testBaton.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) rename examples/libraries/{virtualBaton.25.js => virtualBaton.27.js} (98%) diff --git a/examples/libraries/virtualBaton.25.js b/examples/libraries/virtualBaton.27.js similarity index 98% rename from examples/libraries/virtualBaton.25.js rename to examples/libraries/virtualBaton.27.js index 90b04b8dda..9564f3f737 100644 --- a/examples/libraries/virtualBaton.25.js +++ b/examples/libraries/virtualBaton.27.js @@ -86,9 +86,7 @@ virtualBaton = function virtualBaton(options) { if (!claimCallback) { return; } // We're not participating. nPromises = 0; nQuorum = Math.floor(AvatarList.getAvatarIdentifiers().length / 2) + 1; // N.B.: ASSUMES EVERY USER IS RUNNING THE SCRIPT! - bestPromise.proposerId = MyAvatar.sessionUUID; - bestPromise.number++; - bestPromise.winner = claim; + bestPromise = {number: ++bestPromise.number, proposerId: MyAvatar.sessionUUID, winner: claim}; send('prepare!', bestPromise); function reclaim() { propose(claim); } electionWatchdog = Script.setTimeout(reclaim, electionTimeout); diff --git a/examples/tests/testBaton.js b/examples/tests/testBaton.js index 8c92b320b3..bc6caa6f50 100644 --- a/examples/tests/testBaton.js +++ b/examples/tests/testBaton.js @@ -12,7 +12,7 @@ var Vec3, Quat, MyAvatar, Entities, Camera, Script, print; // All participants should run the test script. -Script.include("../libraries/virtualBaton.25.js"); +Script.include("../libraries/virtualBaton.27.js"); var TICKER_INTERVAL = 1000; // ms var baton = virtualBaton({key: 'io.highfidelity.testBaton'}); var ticker, countDown;