From cd3b080526da6a24718db2f099f76bd6cb9857a4 Mon Sep 17 00:00:00 2001 From: OTHGMars Date: Mon, 16 Jun 2014 20:48:47 -0400 Subject: [PATCH] Item Mounting --- Engine/source/T3D/item.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Engine/source/T3D/item.cpp b/Engine/source/T3D/item.cpp index c946ffa00..8970e3e3c 100644 --- a/Engine/source/T3D/item.cpp +++ b/Engine/source/T3D/item.cpp @@ -556,6 +556,9 @@ void Item::processTick(const Move* move) { Parent::processTick(move); + if ( isMounted() ) + return; + // if (mCollisionObject && !--mCollisionTimeout) mCollisionObject = 0; @@ -606,6 +609,8 @@ void Item::processTick(const Move* move) void Item::interpolateTick(F32 dt) { Parent::interpolateTick(dt); + if ( isMounted() ) + return; // Client side interpolation Point3F pos = delta.pos + delta.posVec * dt; @@ -1365,6 +1370,8 @@ void Item::buildConvex(const Box3F& box, Convex* convex) void Item::advanceTime(F32 dt) { Parent::advanceTime(dt); + if ( isMounted() ) + return; if( mRotate ) {