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

ensure deleted or cleared entities properly unequipped

Browse source
This commit is contained in:
David Back 2018-04-23 16:56:18 -07:00
parent 5cf93ebd1f
commit e21c451815
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/system/controllers/controllerModules/equipEntity.js
View file

@ -838,11 +838,31 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
} }
}; };
var deleteEntity = function(entityID) {
if (rightEquipEntity.targetEntityID === entityID) {
rightEquipEntity.endEquipEntity();
}
if (leftEquipEntity.targetEntityID === entityID) {
leftEquipEntity.endEquipEntity();
}
};
var clearEntities = function() {
if (rightEquipEntity.targetEntityID) {
rightEquipEntity.endEquipEntity();
}
if (leftEquipEntity.targetEntityID) {
leftEquipEntity.endEquipEntity();
}
};
Messages.subscribe('Hifi-Hand-Grab'); Messages.subscribe('Hifi-Hand-Grab');
Messages.subscribe('Hifi-Hand-Drop'); Messages.subscribe('Hifi-Hand-Drop');
Messages.messageReceived.connect(handleMessage); Messages.messageReceived.connect(handleMessage);
Controller.mousePressEvent.connect(onMousePress); Controller.mousePressEvent.connect(onMousePress);
Controller.keyPressEvent.connect(onKeyPress); Controller.keyPressEvent.connect(onKeyPress);
Entities.deletingEntity.connect(deleteEntity);
Entities.clearingEntities.connect(clearEntities);
var leftEquipEntity = new EquipEntity(LEFT_HAND); var leftEquipEntity = new EquipEntity(LEFT_HAND);
var rightEquipEntity = new EquipEntity(RIGHT_HAND); var rightEquipEntity = new EquipEntity(RIGHT_HAND);
@ -859,6 +879,8 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
Messages.messageReceived.disconnect(handleMessage); Messages.messageReceived.disconnect(handleMessage);
Controller.mousePressEvent.disconnect(onMousePress); Controller.mousePressEvent.disconnect(onMousePress);
Controller.keyPressEvent.disconnect(onKeyPress); Controller.keyPressEvent.disconnect(onKeyPress);
Entities.deletingEntity.disconnect(deleteEntity);
Entities.deletingEntity.disconnect(clearEntities);
} }
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
}()); }());