actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always true.

Browse Source
This commit is contained in:
Steve Checkoway
2006-10-01 12:29:14 +00:00
parent 9f9f61579c
commit c89900e2c1
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/XmlFile.cpp
+3 -9
View File
@@ -192,11 +192,9 @@ unsigned XNode::LoadAttributes( const RString &xml, PARSEINFO *pi, unsigned iOff
return string::npos; return string::npos;
} }
bool trim = pi->trim_value; SetString( xml, iOffset, iEnd, &sValue, true );
SetString( xml, iOffset, iEnd, &sValue, trim );
iOffset = iEnd; iOffset = iEnd;
// ATTRVALUE // ATTRVALUE
if( pi->entity_value )
ReplaceEntityText( sValue, g_mapEntitiesToChars ); ReplaceEntityText( sValue, g_mapEntitiesToChars );
if( quote == '"' || quote == '\'' ) if( quote == '"' || quote == '\'' )
@@ -319,12 +317,10 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset )
return string::npos; return string::npos;
} }
bool trim = pi->trim_value; SetString( xml, iOffset, iEnd, &m_sValue, true );
SetString( xml, iOffset, iEnd, &m_sValue, trim );
iOffset = iEnd; iOffset = iEnd;
// TEXTVALUE reference // TEXTVALUE reference
if( pi->entity_value )
ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); ReplaceEntityText( m_sValue, g_mapEntitiesToChars );
} }
@@ -405,12 +401,10 @@ unsigned XNode::Load( const RString &xml, PARSEINFO *pi, unsigned iOffset )
return string::npos; return string::npos;
} }
bool trim = pi->trim_value; SetString( xml, iOffset, iEnd, &m_sValue, true );
SetString( xml, iOffset, iEnd, &m_sValue, trim );
iOffset = iEnd; iOffset = iEnd;
//TEXTVALUE //TEXTVALUE
if( pi->entity_value )
ReplaceEntityText( m_sValue, g_mapEntitiesToChars ); ReplaceEntityText( m_sValue, g_mapEntitiesToChars );
} }
} }
stepmania/src/XmlFile.h
+1 -4
View File
@@ -38,13 +38,10 @@ typedef multimap<RString,XNode*> XNodes;
// Parse info. // Parse info.
struct PARSEINFO struct PARSEINFO
{ {
bool trim_value; // [set] do trim when parse?
bool entity_value; // [set] do convert from reference to entity? ( &lt; -> < )
bool error_occur; // [get] is occurance of error? bool error_occur; // [get] is occurance of error?
RString error_string; // [get] error string RString error_string; // [get] error string
PARSEINFO() { trim_value = true; entity_value = true; error_occur = false; } PARSEINFO() { error_occur = false; }
}; };
// display optional environment // display optional environment