From 8ee052516adb5c0cbf7c5949b8e256519253c592 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 8 Jan 2005 19:12:44 +0000 Subject: [PATCH] XNode::LoadFromFile(RageFileBasic) --- stepmania/src/XmlFile.cpp | 6 ++++++ stepmania/src/XmlFile.h | 1 + 2 files changed, 7 insertions(+) diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp index 3f9d3a0d69..dce165d2e5 100644 --- a/stepmania/src/XmlFile.cpp +++ b/stepmania/src/XmlFile.cpp @@ -1009,6 +1009,12 @@ bool XNode::LoadFromFile( const CString &sFile, PARSEINFO *pi ) LOG->Warn("Couldn't open %s for reading: %s", sFile.c_str(), f.GetError().c_str() ); return false; } + + return LoadFromFile( f, pi ); +} + +bool XNode::LoadFromFile( RageFileBasic &f, PARSEINFO *pi ) +{ CString s; if( f.Read( s ) == -1 ) { diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h index c5b701d667..03916b0669 100644 --- a/stepmania/src/XmlFile.h +++ b/stepmania/src/XmlFile.h @@ -174,6 +174,7 @@ struct XNode bool GetXML( RageFileBasic &f, DISP_OPT *opt = &optDefault ); bool LoadFromFile( const CString &sFile, PARSEINFO *pi = &piDefault ); + bool LoadFromFile( RageFileBasic &f, PARSEINFO *pi = &piDefault ); bool SaveToFile( const CString &sFile, DISP_OPT *opt = &optDefault ); bool SaveToFile( RageFileBasic &f, DISP_OPT *opt = &optDefault );