From 69431f8710e8a556ec733d069ddef399a97b19c1 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 21 Jun 2022 12:00:20 +0200 Subject: Don't use JSON for undo. --- rules.js | 63 ++++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 19 deletions(-) diff --git a/rules.js b/rules.js index 31bc076..182ad3e 100644 --- a/rules.js +++ b/rules.js @@ -264,28 +264,54 @@ function log(s) { game.log.push($(s)); } -function clear_undo() { - if (game.undo) - game.undo.length = 0; - else - game.undo = []; +function deep_copy(original) { + if (Array.isArray(original)) { + let n = original.length + let copy = new Array(n) + for (let i = 0; i < n; ++i) { + let v = original[i] + if (typeof v === "object" && v !== null) + copy[i] = deep_copy(v) + else + copy[i] = v + } + return copy + } else { + let copy = {} + for (let i in original) { + let v = original[i] + if (typeof v === "object" && v !== null) + copy[i] = deep_copy(v) + else + copy[i] = v + } + return copy + } } function push_undo() { - game.undo.push(JSON.stringify(game, (k,v) => { - if (k === 'undo') return 0; - if (k === 'log') return v.length; - return v; - })); + let copy = {} + for (let k in game) { + let v = game[k] + if (k === "undo") continue + else if (k === "log") v = v.length + else if (typeof v === "object" && v !== null) v = deep_copy(v) + copy[k] = v + } + game.undo.push(copy) } function pop_undo() { - let save_undo = game.undo; - let save_log = game.log; - game = JSON.parse(save_undo.pop()); - game.undo = save_undo; - save_log.length = game.log; - game.log = save_log; + let save_log = game.log + let save_undo = game.undo + game = save_undo.pop() + save_log.length = game.log + game.log = save_log + game.undo = save_undo +} + +function clear_undo() { + game.undo = [] } function gen_action_undo(view) { @@ -3303,6 +3329,8 @@ states.game_over = { exports.setup = function (seed, scenario, options) { game = { seed: seed, + undo: [], + log: [], // game board state campaign: 1, @@ -3357,9 +3385,6 @@ exports.setup = function (seed, scenario, options) { attrition: 0, from: null, where: null, - - undo: [], - log: [], }; if (options.cheap_fleets) { -- cgit v1.2.3