[Hgengine-cvs] SF.net SVN: hgengine:[687] Mercury2

[<axl...@us...>]

Revision: 687
          http://hgengine.svn.sourceforge.net/hgengine/?rev=687&view=rev
Author:   axlecrusher
Date:     2010-03-29 18:38:45 +0000 (Mon, 29 Mar 2010)

Log Message:
-----------
Minor changes i have had sitting round for a while.

Modified Paths:
--------------
    Mercury2/modules/Terrain.cpp
    Mercury2/src/Shader.cpp

Modified: Mercury2/modules/Terrain.cpp
===================================================================
--- Mercury2/modules/Terrain.cpp	2010-03-14 23:04:33 UTC (rev 686)
+++ Mercury2/modules/Terrain.cpp	2010-03-29 18:38:45 UTC (rev 687)
@@ -167,7 +167,7 @@
 	{
 		if( Asset().GetLoadState() == LOADING )
 		{
-			POST_MESSAGE( "QueryTerrainPoint", new VertexDataMessage( dynamic_cast<const VertexDataMessage&>(data) ), 0.0001 );
+			POST_MESSAGE( "QueryTerrainPoint", new VertexDataMessage( dynamic_cast<const VertexDataMessage&>(data) ), 0.0001f );
 			return;
 		}
 		const VertexDataMessage& v( dynamic_cast<const VertexDataMessage&>(data) );

Modified: Mercury2/src/Shader.cpp
===================================================================
--- Mercury2/src/Shader.cpp	2010-03-14 23:04:33 UTC (rev 686)
+++ Mercury2/src/Shader.cpp	2010-03-29 18:38:45 UTC (rev 687)
@@ -410,25 +410,25 @@
 	if( f )
 	{
 		iOut[0] = f->GetModTime();
-		delete f;
 	} else
 		iOut[0] = 0;
+	SAFE_DELETE(f);
 
 	f = FILEMAN.Open( sShaderName + ".vert" );
 	if( f )
 	{
 		iOut[1] = f->GetModTime();
-		delete f;
 	} else
 		iOut[1] = 0;
+	SAFE_DELETE(f);
 
 	f = FILEMAN.Open( sShaderName + ".geom" );
 	if( f )
 	{
 		iOut[2] = f->GetModTime();
-		delete f;
 	} else
 		iOut[2] = 0;
+	SAFE_DELETE(f);
 }
 
 void Shader::ActivateShader()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.