aboutsummaryrefslogtreecommitdiff
path: root/src/game/MotionMaster.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-16 11:48:25 -0600
committermegamage <none@none>2009-03-16 11:48:25 -0600
commit2453f2212324d656676693fd2b420290797a9ebf (patch)
tree3d252d74a5b1cf89d8379c22d90285a3865592c3 /src/game/MotionMaster.cpp
parentfdab13e3c1ebd5f516eabca33fb98972a2d1b4c4 (diff)
parentd6a1516057fdb8261ddee94f97d15a8b4f3de3c7 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/MotionMaster.cpp')
-rw-r--r--src/game/MotionMaster.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/game/MotionMaster.cpp b/src/game/MotionMaster.cpp
index b64c17b6342..170a9b52211 100644
--- a/src/game/MotionMaster.cpp
+++ b/src/game/MotionMaster.cpp
@@ -460,6 +460,14 @@ MovementGeneratorType MotionMaster::GetCurrentMovementGeneratorType() const
return top()->GetMovementGeneratorType();
}
+MovementGeneratorType MotionMaster::GetMotionSlotType(int slot) const
+{
+ if(!Impl[slot])
+ return NULL_MOTION_TYPE;
+ else
+ return Impl[slot]->GetMovementGeneratorType();
+}
+
void MotionMaster::InitTop()
{
top()->Initialize(*i_owner);