Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix function name

Browse source
This commit is contained in:
David Rowe 2018-06-09 11:01:18 +12:00
parent 93eba5fe5e
commit dc46c2077d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/controllers/controllerModules/farActionGrabEntity.js
View file

@ -282,7 +282,7 @@ Script.include("/~/system/libraries/Xform.js");
this.previousRoomControllerPosition = roomControllerPosition; this.previousRoomControllerPosition = roomControllerPosition;
}; };
this.endNearGrabAction = function () { this.endFarGrabAction = function () {
ensureDynamic(this.grabbedThingID); ensureDynamic(this.grabbedThingID);
this.distanceHolding = false; this.distanceHolding = false;
this.distanceRotating = false; this.distanceRotating = false;
@ -402,7 +402,7 @@ Script.include("/~/system/libraries/Xform.js");
this.run = function (controllerData) { this.run = function (controllerData) {
if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE || if (controllerData.triggerValues[this.hand] < TRIGGER_OFF_VALUE ||
this.notPointingAtEntity(controllerData) || this.targetIsNull()) { this.notPointingAtEntity(controllerData) || this.targetIsNull()) {
this.endNearGrabAction(); this.endFarGrabAction();
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity",
this.highlightedEntity); this.highlightedEntity);
this.highlightedEntity = null; 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. // stop the far-grab so the near-grab or equip can take over.
for (var k = 0; k < nearGrabReadiness.length; k++) { for (var k = 0; k < nearGrabReadiness.length; k++) {
if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) { if (nearGrabReadiness[k].active && nearGrabReadiness[k].targets[0] === this.grabbedThingID) {
this.endNearGrabAction(); this.endFarGrabAction();
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }
} }
@ -445,7 +445,7 @@ Script.include("/~/system/libraries/Xform.js");
// where it could near-grab something, stop searching. // where it could near-grab something, stop searching.
for (var j = 0; j < nearGrabReadiness.length; j++) { for (var j = 0; j < nearGrabReadiness.length; j++) {
if (nearGrabReadiness[j].active) { if (nearGrabReadiness[j].active) {
this.endNearGrabAction(); this.endFarGrabAction();
return makeRunningValues(false, [], []); return makeRunningValues(false, [], []);
} }
} }
@ -577,7 +577,7 @@ Script.include("/~/system/libraries/Xform.js");
var disableModule = getEnabledModuleByName(moduleName); var disableModule = getEnabledModuleByName(moduleName);
if (disableModule) { if (disableModule) {
if (disableModule.disableModules) { if (disableModule.disableModules) {
this.endNearGrabAction(); this.endFarGrabAction();
Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity",
this.highlightedEntity); this.highlightedEntity);
this.highlightedEntity = null; this.highlightedEntity = null;