[GEN][ZH] Fix and match memory handling and initialisation between gen and zh in W3dWaypointBuffer (#623)

Author: Mauller

Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h

@@ -80,6 +80,7 @@ class W3DWaypointBuffer
 	void freeWaypointBuffers();
 
 private:
+	void setDefaultLineStyle();
 
 	RenderObjClass *m_waypointNodeRobj;
 	SegmentedLineClass *m_line;

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp

@@ -105,16 +105,8 @@ W3DWaypointBuffer::W3DWaypointBuffer(void)
 	m_line = new SegmentedLineClass;
 
 	m_texture = WW3DAssetManager::Get_Instance()->Get_Texture( "EXLaser.tga" );
-	if( m_texture )
-	{
-		m_line->Set_Texture( m_texture );
-	}
-	ShaderClass lineShader=ShaderClass::_PresetAdditiveShader;
-	lineShader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-	m_line->Set_Shader( lineShader );	//pick the alpha blending mode you want - see shader.h for others.
-	m_line->Set_Width( 1.5f );
-	m_line->Set_Color( Vector3( 0.25f, 0.5f, 1.0f ) );
-	m_line->Set_Texture_Mapping_Mode( SegLineRendererClass::TILED_TEXTURE_MAP );	//this tiles the texture across the line
+
+	setDefaultLineStyle();
 }
 
 //=============================================================================
@@ -139,6 +131,21 @@ void W3DWaypointBuffer::freeWaypointBuffers()
 }
 
 
+void W3DWaypointBuffer::setDefaultLineStyle( void )
+{
+	if( m_texture )
+	{
+		m_line->Set_Texture( m_texture );
+	}
+	ShaderClass lineShader=ShaderClass::_PresetAdditiveShader;
+	lineShader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
+	m_line->Set_Shader( lineShader );	//pick the alpha blending mode you want - see shader.h for others.
+	m_line->Set_Width( 1.5f );
+	m_line->Set_Color( Vector3( 0.25f, 0.5f, 1.0f ) );
+	m_line->Set_Texture_Mapping_Mode( SegLineRendererClass::TILED_TEXTURE_MAP );	//this tiles the texture across the line
+}
+
+
 //=============================================================================
 // W3DWaypointBuffer::drawWaypoints
 //=============================================================================

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h

@@ -79,9 +79,8 @@ class W3DWaypointBuffer
 	void drawWaypoints(RenderInfoClass &rinfo);
 	void freeWaypointBuffers();
 
-
 private:
-  void setDefaultLineStyle();
+	void setDefaultLineStyle();
 
 	RenderObjClass *m_waypointNodeRobj;
 	SegmentedLineClass *m_line;

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp

@@ -106,8 +106,7 @@ W3DWaypointBuffer::W3DWaypointBuffer(void)
 
 	m_texture = WW3DAssetManager::Get_Instance()->Get_Texture( "EXLaser.tga" );
 
-
-  setDefaultLineStyle();
+	setDefaultLineStyle();
 }
 
 //=============================================================================