From dd297ce39d2227bb00fd983f4d348ddce222ecc5 Mon Sep 17 00:00:00 2001
From: Azaezel <quillus@hotmail.com>
Date: Thu, 15 Mar 2018 20:47:25 -0500
Subject: [PATCH] forest shadowvar cleanups

---
 Engine/source/forest/forestCollision.cpp   | 2 +-
 Engine/source/forest/forestWindEmitter.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Engine/source/forest/forestCollision.cpp b/Engine/source/forest/forestCollision.cpp
index 213f15775..468c901dc 100644
--- a/Engine/source/forest/forestCollision.cpp
+++ b/Engine/source/forest/forestCollision.cpp
@@ -151,7 +151,7 @@ void ForestConvex::getFeatures( const MatrixF &mat, const VectorF &n, ConvexFeat
    for (i = 0; i < numVerts; i++) 
    {
       cf->mVertexList.increment();
-      U32 index = emitString[currPos++];
+      index = emitString[currPos++];
       mat.mulP(pAccel->vertexList[index], &cf->mVertexList.last());
    }
 
diff --git a/Engine/source/forest/forestWindEmitter.cpp b/Engine/source/forest/forestWindEmitter.cpp
index 46b879214..f02adbee6 100644
--- a/Engine/source/forest/forestWindEmitter.cpp
+++ b/Engine/source/forest/forestWindEmitter.cpp
@@ -150,10 +150,10 @@ void ForestWind::processTick()
       mCurrentInterp = 0;
       mCurrentTarget.set( 0, 0 );
    
-      Point2F windDir( mDirection.x, mDirection.y );
-      windDir.normalizeSafe();
+      Point2F windNorm( mDirection.x, mDirection.y );
+	  windNorm.normalizeSafe();
 
-      mCurrentTarget = finalVec + windDir;
+      mCurrentTarget = finalVec + windNorm;
    }
    else
    {