aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-03 22:34:05 +0100
committerJustin Clark-Casey (justincc)2011-08-03 22:34:05 +0100
commita333c60f28acf1298c929f9129d3537f3f97e638 (patch)
tree23f3803c04677b6f2bb2d7b6ee745075d9baceae /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
parentget rid of vestigal move to parameters (diff)
downloadopensim-SC-a333c60f28acf1298c929f9129d3537f3f97e638.zip
opensim-SC-a333c60f28acf1298c929f9129d3537f3f97e638.tar.gz
opensim-SC-a333c60f28acf1298c929f9129d3537f3f97e638.tar.bz2
opensim-SC-a333c60f28acf1298c929f9129d3537f3f97e638.tar.xz
refactor: rename the move to position methods to move to target to be consistent with terminology used by scene object part and elsewhere
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index a78ad0c..1d88e43 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
74 { 74 {
75// m_log.DebugFormat("[NPC MODULE]: Stopping movement of npc {0} {1}", presence.Name, presence.UUID); 75// m_log.DebugFormat("[NPC MODULE]: Stopping movement of npc {0} {1}", presence.Name, presence.UUID);
76 // We are close enough to the target for now 76 // We are close enough to the target for now
77 presence.ResetMoveToPosition(); 77 presence.ResetMoveToTarget();
78 presence.Velocity = Vector3.Zero; 78 presence.Velocity = Vector3.Zero;
79 79
80 // FIXME: This doesn't work 80 // FIXME: This doesn't work
@@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
86 else 86 else
87 { 87 {
88 Vector3 agent_control_v3 = new Vector3(); 88 Vector3 agent_control_v3 = new Vector3();
89 presence.DoMoveToPositionUpdate(ref agent_control_v3, presence.Rotation, false, true); 89 presence.HandleMoveToPositionUpdate(ref agent_control_v3, presence.Rotation, false, true);
90 presence.AddNewMovement(agent_control_v3, presence.Rotation); 90 presence.AddNewMovement(agent_control_v3, presence.Rotation);
91 } 91 }
92// 92//
@@ -189,7 +189,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
189 m_log.DebugFormat( 189 m_log.DebugFormat(
190 "[NPC MODULE]: Moving {0} to {1} in {2}", sp.Name, pos, scene.RegionInfo.RegionName); 190 "[NPC MODULE]: Moving {0} to {1} in {2}", sp.Name, pos, scene.RegionInfo.RegionName);
191 191
192 sp.DoMoveToPosition(pos); 192 sp.MoveToTarget(pos);
193 } 193 }
194 } 194 }
195 } 195 }