diff options
| author | Melanie | 2011-11-10 22:34:54 +0100 |
|---|---|---|
| committer | Melanie | 2011-11-10 22:34:54 +0100 |
| commit | 81fbe7ffb16cddd568a5d4969782a9b679f10d4d (patch) | |
| tree | a382b3990e01d8a86a6f96f1f37fb9695562cfdd /OpenSim | |
| parent | Fix misaligned sit animation on scripted sit caused by the default sit (diff) | |
| download | opensim-SC-81fbe7ffb16cddd568a5d4969782a9b679f10d4d.zip opensim-SC-81fbe7ffb16cddd568a5d4969782a9b679f10d4d.tar.gz opensim-SC-81fbe7ffb16cddd568a5d4969782a9b679f10d4d.tar.bz2 opensim-SC-81fbe7ffb16cddd568a5d4969782a9b679f10d4d.tar.xz | |
Implement nudging support for strafing motion
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index bb19621..c4bd016 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1514,7 +1514,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1514 | 1514 | ||
| 1515 | if ((MovementFlag & (byte)(uint)DCF) == 0) | 1515 | if ((MovementFlag & (byte)(uint)DCF) == 0) |
| 1516 | { | 1516 | { |
| 1517 | if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) | 1517 | if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE || |
| 1518 | DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE) | ||
| 1518 | { | 1519 | { |
| 1519 | MovementFlag |= (byte)nudgehack; | 1520 | MovementFlag |= (byte)nudgehack; |
| 1520 | } | 1521 | } |
| @@ -1527,7 +1528,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1527 | else | 1528 | else |
| 1528 | { | 1529 | { |
| 1529 | if ((MovementFlag & (byte)(uint)DCF) != 0 || | 1530 | if ((MovementFlag & (byte)(uint)DCF) != 0 || |
| 1530 | ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE) | 1531 | ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE || |
| 1532 | DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_LEFT_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_RIGHT_NUDGE) | ||
| 1531 | && ((MovementFlag & (byte)nudgehack) == nudgehack)) | 1533 | && ((MovementFlag & (byte)nudgehack) == nudgehack)) |
| 1532 | ) // This or is for Nudge forward | 1534 | ) // This or is for Nudge forward |
| 1533 | { | 1535 | { |