[Hgengine-cvs] SF.net SVN: hgengine:[367] Mercury2/modules/TextNode.cpp

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

Revision: 367
          http://hgengine.svn.sourceforge.net/hgengine/?rev=367&view=rev
Author:   axlecrusher
Date:     2009-06-23 23:48:43 +0000 (Tue, 23 Jun 2009)

Log Message:
-----------
fix critical bugs.
initialize variables in contructor.
fix order of setting a  pointer in the event of a failure

Modified Paths:
--------------
    Mercury2/modules/TextNode.cpp

Modified: Mercury2/modules/TextNode.cpp
===================================================================
--- Mercury2/modules/TextNode.cpp	2009-06-23 13:51:18 UTC (rev 366)
+++ Mercury2/modules/TextNode.cpp	2009-06-23 23:48:43 UTC (rev 367)
@@ -9,7 +9,7 @@
 REGISTER_NODE_TYPE(TextNode);
 
 TextNode::TextNode()
-	:MercuryNode(),m_fSize(1.),m_bDirty(0), m_kVBO(0), m_kTEX(0)
+	:MercuryNode(),m_fSize(1.),m_bDirty(false),m_pThisFont(NULL),m_kVBO(0), m_kTEX(0)
 {
 }
 
@@ -168,13 +168,13 @@
 {
 	if( g_AllFonts.get( sFont ) == 0 )
 	{
-		m_pThisFont = &g_AllFonts[sFont];
 		if( !m_pThisFont->LoadFromFile( sFont ) )
 		{
 			fprintf( stderr, "Error: Could not load font: \"%s\".", sFont.c_str() );
 			g_AllFonts.remove( sFont );
 			return false;
 		}
+		m_pThisFont = &g_AllFonts[sFont];
 	} else
 		m_pThisFont = &g_AllFonts[sFont];
 	SetDirtyText();


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