diff --git a/stepmania/src/RageFileDriverZip.cpp b/stepmania/src/RageFileDriverZip.cpp index e8af1d39d4..b348399d9d 100644 --- a/stepmania/src/RageFileDriverZip.cpp +++ b/stepmania/src/RageFileDriverZip.cpp @@ -90,7 +90,8 @@ bool RageFileDriverZip::ReadEndCentralRecord( int &iTotalEntries, int &iCentralD iTotalEntries = FileReading::read_16_le( *m_pZip, sError ); FileReading::read_32_le( *m_pZip, sError ); /* skip size of the central directory */ iCentralDirectoryOffset = FileReading::read_32_le( *m_pZip, sError ); - FileReading::read_16_le( *m_pZip, sError ); /* skip zipfile comment length */ + int iCommentLength = FileReading::read_16_le( *m_pZip, sError ); + m_sComment = FileReading::ReadString( *m_pZip, iCommentLength, sError ); if( sError != "" ) { @@ -357,11 +358,6 @@ void RageFileDriverZip::FlushDirCache( const RString &sPath ) } -RString RageFileDriverZip::GetGlobalComment() const -{ - ASSERT(0); -} - /* * Copyright (c) 2003-2005 Glenn Maynard. All rights reserved. * All rights reserved. diff --git a/stepmania/src/RageFileDriverZip.h b/stepmania/src/RageFileDriverZip.h index e6206f525b..35d5e48964 100644 --- a/stepmania/src/RageFileDriverZip.h +++ b/stepmania/src/RageFileDriverZip.h @@ -6,7 +6,6 @@ #include "RageFileDriver.h" #include "RageThreads.h" -struct end_central_dir_record; class RageFileDriverZip: public RageFileDriver { public: @@ -40,7 +39,7 @@ public: }; const FileInfo *GetFileInfo( const RString &sPath ) const; - RString GetGlobalComment() const; + RString GetGlobalComment() const { return m_sComment; } private: bool m_bFileOwned; @@ -49,6 +48,7 @@ private: vector m_pFiles; RString m_sPath; + RString m_sComment; /* Open() must be threadsafe. Mutex access to "zip", since we seek * around in it when reading files. */