wrap far trigger too with seated check

Philip Rosedale committed 9 years ago

Commit a689d521 parent 0ad9a861 file · +2 −3Browse files

Showing the changes to scripts/tutorials/entity_scripts (1 of 1 file). Show all

Unified · Split

         var howFar = howFarAway(props.position);
         if ((state === STANDING) && (howFar < sitDistance) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = true;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from being close");
         props = Entities.getEntityProperties(entity, [ "position", "rotation" ]);
         if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = false;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from mouse click");
     }
     this.startFarTrigger = function() {
+        if ((state === STANDING) && isSeatOpen(props.position, sitDistance)) {
             moveToSeat(props.position, props.rotation);
-            //MyAvatar.characterControllerEnabled = false;
             enterSitPose();
             state = SITTING;
             debugPrint("Sitting from far trigger");
+        }
     }
     this.checkSettings = function() {

Keyboard shortcuts