From fd7e23fce8b6bda0a01f52ffe470eb8445650d98 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 9 Dec 2004 08:47:24 +0000 Subject: [PATCH] remove SeekCur --- stepmania/src/RageFile.cpp | 32 +------------------------------- stepmania/src/RageFile.h | 1 - 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/stepmania/src/RageFile.cpp b/stepmania/src/RageFile.cpp index 84c08afa6d..5b4596ab94 100644 --- a/stepmania/src/RageFile.cpp +++ b/stepmania/src/RageFile.cpp @@ -292,36 +292,6 @@ int RageFile::Seek( int offset ) return pos; } -int RageFile::SeekCur( int offset ) -{ - ASSERT( offset >= 0 ); - - if( !IsOpen() ) - RageException::Throw("\"%s\" is not open.", GetPath().c_str()); - - if( !(m_Mode&READ) ) - RageException::Throw("\"%s\" is not open for reading; can't seek", GetPath().c_str()); - - if( !offset || m_EOF ) - return m_FilePos; - - int FromBuffer = min( offset, m_BufAvail ); - m_FilePos += FromBuffer; - offset -= FromBuffer; - m_BufAvail -= FromBuffer; - m_pBuf += FromBuffer; - - if( offset ) - { - int pos = m_File->SeekCur( offset ); - if( pos == -1 ) - return -1; - - m_FilePos = pos; - } - return m_FilePos; -} - int RageFile::GetFileSize() const { if( !IsOpen() ) @@ -429,7 +399,7 @@ int RageFile::Seek( int offset, int whence ) switch( whence ) { case SEEK_CUR: - return SeekCur( (int) offset ); + return Seek( Tell() + offset ); case SEEK_END: offset += GetFileSize(); } diff --git a/stepmania/src/RageFile.h b/stepmania/src/RageFile.h index afcc2afed6..05e27ebb6a 100644 --- a/stepmania/src/RageFile.h +++ b/stepmania/src/RageFile.h @@ -50,7 +50,6 @@ public: int Tell() const { return m_FilePos; } int Seek( int offset ); - int SeekCur( int offset ); int GetFileSize() const; void Rewind();