diff --git a/stepmania/src/RageFile.h b/stepmania/src/RageFile.h index 8d27a723df..4c058f2956 100644 --- a/stepmania/src/RageFile.h +++ b/stepmania/src/RageFile.h @@ -1,5 +1,5 @@ -#ifndef RageFile_H -#define RageFile_H +#ifndef RAGE_FILE_H +#define RAGE_FILE_H /* ----------------------------------------------------------------------------- @@ -9,7 +9,7 @@ Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. Chris Danford - Steve Checkoway + Steve Checkoway ----------------------------------------------------------------------------- */ @@ -39,7 +39,7 @@ public: bool IsOpen() { return (mFP != NULL); } bool AtEOF() { return (feof(mFP) != 0); } int GetError() { return ferror(mFP); } - FILE *GetFilePointer() { return mFP; } + void ClearError() { clearerr(mFP); } long Tell() { return ftell(mFP); } bool Seek(long offset, int origin = SEEK_CUR) { return !fseek(mFP, offset, origin); } diff --git a/stepmania/src/TitleSubstitution.cpp b/stepmania/src/TitleSubstitution.cpp index 8bac49f15a..e5dd2ec549 100644 --- a/stepmania/src/TitleSubstitution.cpp +++ b/stepmania/src/TitleSubstitution.cpp @@ -114,7 +114,7 @@ void TitleSubst::Load(const CString &filename, const CString §ion) CString line = f.GetLine(); if (f.GetError() != 0) { - clearerr(f.GetFilePointer()); + f.ClearError(); continue; } if(line.size() > 0 && utf8_get_char(line.c_str()) == 0xFEFF)