From dc46c2077d2e8e0abdcd2a3a4e956fd0cd5b58df Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 9 Jun 2018 11:01:18 +1200 Subject: [PATCH] Fix function name --- .../controllerModules/farActionGrabEntity.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js index 66cd197abd..d79ffeb5ac 100644 --- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js +++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js @@ -282,7 +282,7 @@ Script.include("/~/system/libraries/Xform.js"); this.previousRoomControllerPosition = roomControllerPosition; }; - this.endNearGrabAction = function () { + this.endFarGrabAction = function () { ensureDynamic(this.grabbedThingID); this.distanceHolding = false; this.distanceRotating = false; @@ -402,7 +402,7 @@ Script.include("/~/system/libraries/Xform.js"); this.run = function (controllerData) { if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE || this.notPointingAtEntity(controllerData) || this.targetIsNull()) { - this.endNearGrabAction(); + this.endFarGrabAction(); Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity); this.highlightedEntity = null; @@ -434,7 +434,7 @@ Script.include("/~/system/libraries/Xform.js"); // stop the far-grab so the near-grab or equip can take over. for (var k = 0; k < nearGrabReadiness.length; k++) { if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) { - this.endNearGrabAction(); + this.endFarGrabAction(); return makeRunningValues(false, [], []); } } @@ -445,7 +445,7 @@ Script.include("/~/system/libraries/Xform.js"); // where it could near-grab something, stop searching. for (var j = 0; j < nearGrabReadiness.length; j++) { if (nearGrabReadiness[j].active) { - this.endNearGrabAction(); + this.endFarGrabAction(); return makeRunningValues(false, [], []); } } @@ -577,7 +577,7 @@ Script.include("/~/system/libraries/Xform.js"); var disableModule = getEnabledModuleByName(moduleName); if (disableModule) { if (disableModule.disableModules) { - this.endNearGrabAction(); + this.endFarGrabAction(); Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity); this.highlightedEntity = null;