From dbdfa624e10de50240aff0cc755a5046ea954e6b Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 8 Jul 2013 13:12:12 -0700 Subject: [PATCH] Don't start the player with collision disabled Since we spawn properly at the door now, there's no reason to start with tcl on. --- libs/openengine/bullet/physic.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp index 550e71b3c..66ee077ee 100644 --- a/libs/openengine/bullet/physic.cpp +++ b/libs/openengine/bullet/physic.cpp @@ -21,9 +21,6 @@ namespace Physic : mName(name), mEngine(engine), mMesh(mesh), mBoxScaledTranslation(0,0,0), mBoxRotationInverse(0,0,0,0) , mBody(0), mRaycastingBody(0), onGround(false), collisionMode(true), mBoxRotation(0,0,0,0), verticalForce(0.0f) { - // FIXME: Force player to start in no-collision mode for now, until he spawns at a proper door marker. - if(name == "player") - collisionMode = false; mBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation); mRaycastingBody = mEngine->createAndAdjustRigidBody(mMesh, mName, scale, position, rotation, &mBoxScaledTranslation, &mBoxRotation, true); Ogre::Quaternion inverse = mBoxRotation.Inverse();