Merge pull request #2309 from suncaller/warning-purge

Remove redundant variables and clean up C4312 and C4305 warnings

Author: Areloch

Engine/source/T3D/components/animation/animationComponent.cpp

@@ -621,8 +621,6 @@ void AnimationComponent::advanceThreads(F32 dt)
       Thread& st = mAnimationThreads[i];
       if (st.thread && st.sequence != -1)
       {
-         bool cyclic = getShape()->sequences[st.sequence].isCyclic();
-
          if (!getShape()->sequences[st.sequence].isCyclic() &&
             !st.atEnd &&
             ((st.timescale > 0.f) ? mOwnerShapeInstance->getPos(st.thread) >= 1.0 : mOwnerShapeInstance->getPos(st.thread) <= 0))

Engine/source/T3D/components/camera/cameraComponent.cpp

@@ -237,8 +237,6 @@ bool CameraComponent::getCameraTransform(F32* pos,MatrixF* mat)
 {
    // Returns camera to world space transform
    // Handles first person / third person camera position
-   bool isServer = isServerObject();
-
    if (mTargetNodeIdx == -1)
    {
       if (mUseParentTransform)
@@ -479,7 +477,6 @@ void CameraComponent::setRotation(RotationF newRot)
 Frustum CameraComponent::getFrustum()
 {
    Frustum visFrustum;
-   F32 left, right, top, bottom;
    F32 aspectRatio = mClientScreen.x / mClientScreen.y;
 
    visFrustum.set(false, mDegToRad(mCameraFov), aspectRatio, 0.1f, 1000, mOwner->getTransform());

Engine/source/T3D/components/collision/collisionComponent.cpp

@@ -538,7 +538,6 @@ PhysicsCollision* CollisionComponent::buildColShapes()
          for (S32 o = start; o < end; o++)
          {
             const TSShape::Object &object = shape->objects[o];
-            const String &meshName = shape->names[object.nameIndex];
 
             if (object.numMeshes <= detail.objectDetailNum)
                continue;

Engine/source/T3D/components/game/stateMachine.cpp

@@ -152,7 +152,6 @@ void StateMachine::readConditions(StateTransition &currentTransition)
       //get our first state
       StateTransition::Condition firstCondition;
       StateField firstField;
-      bool fieldRead = false;
 
       readFieldName(&firstField, reader);
       firstCondition.field = firstField;

Engine/source/T3D/components/game/triggerComponent.cpp

@@ -239,8 +239,6 @@ bool TriggerComponent::testObject(SceneObject* enter)
                myList.setObject(mOwner);
 
                myCI->buildPolyList(PLC_Collision, &myList, enterBox, sphere);
-
-               bool test = true;
             }
          }
       }

Engine/source/T3D/components/physics/playerControllerComponent.cpp

@@ -330,9 +330,6 @@ void PlayerControllerComponent::updateMove()
    }
 
    // Update current orientation
-   bool doStandardMove = true;
-   GameConnection* con = mOwner->getControllingClient();
-
    MatrixF zRot;
    zRot.set(EulerF(0.0f, 0.0f, mOwner->getRotation().asEulerF().z));
 
@@ -355,7 +352,6 @@ void PlayerControllerComponent::updateMove()
    mContactInfo.jump = false;
    mContactInfo.run = false;
 
-   bool jumpSurface = false, runSurface = false;
    if (!mOwner->isMounted())
       findContact(&mContactInfo.run, &mContactInfo.jump, &mContactInfo.contactNormal);
    if (mContactInfo.jump)
@@ -577,7 +573,6 @@ void PlayerControllerComponent::updatePos(const F32 travelTime)
    newPos = mPhysicsRep->move(mVelocity * travelTime, collisionList);
 
    bool haveCollisions = false;
-   bool wasFalling = mFalling;
    if (collisionList.getCount() > 0)
    {
       mFalling = false;

Engine/source/T3D/convexShape.cpp

@@ -719,8 +719,6 @@ bool ConvexShape::buildExportPolyList(ColladaUtils::ExportData* exportData, cons
    //Convex shapes only have the one 'level', so we'll just rely on the export post-process to back-fill
    if (isServerObject() && getClientObject())
    {
-      ConvexShape* clientShape = dynamic_cast<ConvexShape*>(getClientObject());
-
       exportData->meshData.increment();
 
       //Prep a meshData for this shape in particular

Engine/source/T3D/entity.cpp

@@ -306,8 +306,6 @@ void Entity::onPostAdd()
 
 bool Entity::_setGameObject(void *object, const char *index, const char *data)
 {
-   Entity *e = static_cast<Entity*>(object);
-
    // Sanity!
    AssertFatal(data != NULL, "Cannot use a NULL asset Id.");
 
@@ -513,8 +511,6 @@ U32 Entity::packUpdate(NetConnection *con, U32 mask, BitStream *stream)
 
       for (U32 i = 0; i < mNetworkedComponents.size(); i++)
       {
-         NetworkedComponent::UpdateState state = mNetworkedComponents[i].updateState;
-
          if (mNetworkedComponents[i].updateState == NetworkedComponent::Adding)
          {
             const char* className = mComponents[mNetworkedComponents[i].componentIndex]->getClassName();
@@ -1381,7 +1377,6 @@ bool Entity::removeComponent(Component *comp, bool deleteComponent)
 //to re-add them. Need to implement a clean clear function that will clear the local list, and only delete unused behaviors during an update.
 void Entity::clearComponents(bool deleteComponents)
 {
-   bool srv = isServerObject();
    if (!deleteComponents)
    {
       while (mComponents.size() > 0)
@@ -1399,8 +1394,6 @@ void Entity::clearComponents(bool deleteComponents)
          {
             comp->onComponentRemove(); //in case the behavior needs to do cleanup on the owner
 
-            bool removed = mComponents.remove(comp);
-
             //we only need to delete them on the server side. they'll be cleaned up on the client side
             //via the ghosting system for us
             if (isServerObject())
@@ -1663,7 +1656,6 @@ void Entity::notifyComponents(String signalFunction, String argA, String argB, S
 
 void Entity::setComponentsDirty()
 {
-   bool tmp = true;
    /*if (mToLoadComponents.empty())
       mStartComponentUpdate = true;
 
@@ -1694,7 +1686,6 @@ void Entity::setComponentsDirty()
 
 void Entity::setComponentDirty(Component *comp, bool forceUpdate)
 {
-   bool found = false;
    for (U32 i = 0; i < mComponents.size(); i++)
    {
       if (mComponents[i]->getId() == comp->getId())

Engine/source/T3D/entity.h

@@ -309,7 +309,6 @@ Vector<T*> Entity::getComponents()
    Vector<T*> foundObjects;
 
    T *curObj;
-   Component* comp;
 
    // Loop through our child objects.
    for (U32 i = 0; i < mComponents.size(); i++)

Engine/source/T3D/fx/particleEmitter.cpp

@@ -490,7 +490,7 @@ void ParticleEmitterData::unpackData(BitStream* stream)
 #if defined(AFX_CAP_PARTICLE_POOLS) 
    if (stream->readFlag())
    {
-      pool_datablock = (afxParticlePoolData*)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
+      pool_datablock = (afxParticlePoolData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast);
       stream->read(&pool_index);
       pool_depth_fade = stream->readFlag();
       pool_radial_fade = stream->readFlag();