From e2eac8c7555213e2b736b344c277a935ba4187a1 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 1 Jun 2020 17:13:12 -0700
Subject: [PATCH] Prefer App.UI.DOM.renderPassage to
$(element).wiki('<<include>>').
---
src/events/reRelativeRecruiter.js | 4 +---
src/interaction/slaveInteract.js | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/events/reRelativeRecruiter.js b/src/events/reRelativeRecruiter.js
index a478be3f8b8..67ff5e83dfe 100644
--- a/src/events/reRelativeRecruiter.js
+++ b/src/events/reRelativeRecruiter.js
@@ -637,10 +637,8 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
let elements = [];
elements.push(`You complete the legalities and biometric scanning quickly and without fuss. ${V.activeSlave.slaveName} arrives shortly. The two slaves remember each other only dimly — they parted a long time ago — but they embrace. The devoted ${SlaveTitle(eventSlave)} explains the situation and encourages ${his} ${_this.params.relative} to be a good slave to you. ${V.activeSlave.slaveName} looks a little fearful but clearly realizes that ${he2}'s lucky to be here.`);
- let desc = document.createDocumentFragment();
V.eventSlave = eventSlave; // New Slave Intro uses global $eventSlave, so set it here
- $(desc).wiki(`<<include "New Slave Intro">>`);
- elements.push(desc);
+ elements.push(App.UI.DOM.renderPassage("New Slave Intro"));
return elements;
}
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index e31d80f5605..c3727380d28 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1308,8 +1308,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
Engine.play(sexOption.goto);
} else if (sexOption.scene) {
// Run scene and store render results temporarily
- let frag = document.createDocumentFragment();
- $(frag).wiki(`<<include "${sexOption.scene}">>`);
+ let frag = App.UI.DOM.renderPassage(sexOption.scene);
// Refresh (clears scene display)
App.UI.SlaveInteract.refreshAll(V.slaves[V.slaveIndices[V.activeSlave.ID]]);
--
GitLab