diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/EntityBase.cs | 26 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 4 insertions, 24 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs index 82f829d..ffcc44b 100644 --- a/OpenSim/Region/Environment/Scenes/EntityBase.cs +++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs | |||
@@ -34,8 +34,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
34 | { | 34 | { |
35 | public abstract class EntityBase | 35 | public abstract class EntityBase |
36 | { | 36 | { |
37 | protected List<EntityBase> m_children; | ||
38 | |||
39 | protected Scene m_scene; | 37 | protected Scene m_scene; |
40 | 38 | ||
41 | public Scene Scene | 39 | public Scene Scene |
@@ -113,33 +111,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
113 | Rotation = new Quaternion(); | 111 | Rotation = new Quaternion(); |
114 | m_name = "(basic entity)"; | 112 | m_name = "(basic entity)"; |
115 | m_rotationalvelocity = new LLVector3(0, 0, 0); | 113 | m_rotationalvelocity = new LLVector3(0, 0, 0); |
116 | m_children = new List<EntityBase>(); | ||
117 | } | 114 | } |
118 | 115 | ||
119 | /// <summary> | 116 | /// <summary> |
120 | /// | 117 | /// |
121 | /// </summary> | 118 | /// </summary> |
122 | public virtual void UpdateMovement() | 119 | public abstract void UpdateMovement(); |
123 | { | ||
124 | foreach (EntityBase child in m_children) | ||
125 | |||
126 | { | ||
127 | child.UpdateMovement(); | ||
128 | } | ||
129 | } | ||
130 | 120 | ||
131 | /// <summary> | 121 | /// <summary> |
132 | /// Performs any updates that need to be done at each frame. This function is overridable from it's children. | 122 | /// Performs any updates that need to be done at each frame. |
133 | /// </summary> | 123 | /// </summary> |
134 | public virtual void Update() | 124 | public abstract void Update(); |
135 | { | ||
136 | // Do any per-frame updates needed that are applicable to every type of entity | ||
137 | |||
138 | foreach (EntityBase child in m_children) | ||
139 | { | ||
140 | child.Update(); | ||
141 | } | ||
142 | } | ||
143 | 125 | ||
144 | /// <summary> | 126 | /// <summary> |
145 | /// Copies the entity | 127 | /// Copies the entity |
@@ -174,4 +156,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
174 | HitTF = _HitTF; | 156 | HitTF = _HitTF; |
175 | } | 157 | } |
176 | } | 158 | } |
177 | } \ No newline at end of file | 159 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index eb5a80c..5ae657e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1585,8 +1585,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
1585 | { | 1585 | { |
1586 | part.UpdateMovement(); | 1586 | part.UpdateMovement(); |
1587 | } | 1587 | } |
1588 | |||
1589 | base.UpdateMovement(); | ||
1590 | } | 1588 | } |
1591 | 1589 | ||
1592 | /// <summary> | 1590 | /// <summary> |