From c2e74f375a5da83d7662c1ccd8f895a3860013a7 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Mon, 11 May 2020 15:37:43 -0500
Subject: [PATCH] uninitialized variables-terrain

---
 Engine/source/terrain/terrCell.cpp         |  6 +++++-
 Engine/source/terrain/terrCellMaterial.cpp |  3 ++-
 Engine/source/terrain/terrCellMaterial.h   | 12 +++++++++++-
 Engine/source/terrain/terrCollision.cpp    |  9 ++++++++-
 Engine/source/terrain/terrData.cpp         |  1 +
 Engine/source/terrain/terrFile.cpp         |  1 +
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Engine/source/terrain/terrCell.cpp b/Engine/source/terrain/terrCell.cpp
index ba1262df1..e1b0caecb 100644
--- a/Engine/source/terrain/terrCell.cpp
+++ b/Engine/source/terrain/terrCell.cpp
@@ -58,7 +58,11 @@ TerrCell::TerrCell()
       mHasEmpty( false ),
       mMaterial( NULL ),
       mMaterials( 0 ),
-      mIsInteriorOnly( false )
+      mIsInteriorOnly( false ),
+      mSize(smMinCellSize),
+      mLevel(0),
+      mTerrain(NULL),
+      mRadius(0.5f)
 {
    dMemset( mChildren, 0, sizeof( mChildren ) );
    zode_vertexBuffer = 0;
diff --git a/Engine/source/terrain/terrCellMaterial.cpp b/Engine/source/terrain/terrCellMaterial.cpp
index 66ecfb4c2..fbcac6f1e 100644
--- a/Engine/source/terrain/terrCellMaterial.cpp
+++ b/Engine/source/terrain/terrCellMaterial.cpp
@@ -73,7 +73,8 @@ TerrainCellMaterial::TerrainCellMaterial()
    :  mTerrain( NULL ),
       mCurrPass( 0 ),
       mDeferredMat( NULL ),
-      mReflectMat( NULL )
+      mReflectMat( NULL ),
+      mMaterials(0)
 {
    smAllMaterials.push_back( this );
 }
diff --git a/Engine/source/terrain/terrCellMaterial.h b/Engine/source/terrain/terrCellMaterial.h
index d762dd4d5..a635486ba 100644
--- a/Engine/source/terrain/terrCellMaterial.h
+++ b/Engine/source/terrain/terrCellMaterial.h
@@ -58,6 +58,8 @@ protected:
    public:
 
       MaterialInfo()
+         :mat(NULL), layerId(0), detailTexConst(NULL), macroTexConst(NULL), normalTexConst(NULL),
+         compositeTexConst(NULL), detailInfoVConst(NULL), detailInfoPConst(NULL), macroInfoVConst(NULL), macroInfoPConst(NULL)
       {
       }
 
@@ -92,7 +94,15 @@ protected:
    public:
 
       Pass() 
-         :  shader( NULL )                     
+         :  shader( NULL ),
+         modelViewProjConst(NULL), worldViewOnly(NULL), viewToObj(NULL),
+         eyePosWorldConst(NULL), eyePosConst(NULL),
+         objTransConst(NULL), worldToObjConst(NULL), vEyeConst(NULL),
+         layerSizeConst(NULL), lightParamsConst(NULL), lightInfoBufferConst(NULL),
+         baseTexMapConst(NULL), layerTexConst(NULL),
+         lightMapTexConst(NULL),
+         squareSize(NULL), oneOverTerrainSize(NULL),
+         fogDataConst(NULL), fogColorConst(NULL)
       {
       }
 
diff --git a/Engine/source/terrain/terrCollision.cpp b/Engine/source/terrain/terrCollision.cpp
index bb8211199..0d2cb905f 100644
--- a/Engine/source/terrain/terrCollision.cpp
+++ b/Engine/source/terrain/terrCollision.cpp
@@ -167,13 +167,20 @@ S32 sFaceList135[16][9] = {
 
 TerrainConvex::TerrainConvex() 
 {
+   halfA = true;
+   square = NULL;
+   squareId = 0;
+   material = 0;
+   split45 = false;
+
    mType = TerrainConvexType; 
 }
 
 TerrainConvex::TerrainConvex( const TerrainConvex &cv ) 
 {
    mType = TerrainConvexType;
-
+   halfA = false;
+   square = NULL;
    // Only a partial copy...
    mObject = cv.mObject;
    split45 = cv.split45;
diff --git a/Engine/source/terrain/terrData.cpp b/Engine/source/terrain/terrData.cpp
index a9c70080f..7abfbc867 100644
--- a/Engine/source/terrain/terrData.cpp
+++ b/Engine/source/terrain/terrData.cpp
@@ -190,6 +190,7 @@ TerrainBlock::TerrainBlock()
    mMaxDetailDistance( 0.0f ),
    mBaseTexScaleConst( NULL ),
    mBaseTexIdConst( NULL ),
+   mBaseLayerSizeConst(NULL),
    mDetailsDirty( false ),
    mLayerTexDirty( false ),
    mBaseTexSize( 1024 ),
diff --git a/Engine/source/terrain/terrFile.cpp b/Engine/source/terrain/terrFile.cpp
index 0970f48bc..727074106 100644
--- a/Engine/source/terrain/terrFile.cpp
+++ b/Engine/source/terrain/terrFile.cpp
@@ -46,6 +46,7 @@ template<> ResourceBase::Signature Resource<TerrainFile>::signature()
 
 TerrainFile::TerrainFile()
    : mSize( 256 ),
+     mGridLevels(0),
      mFileVersion( FILE_VERSION ),
      mNeedsResaving( false )
 {