mirror of
https://github.com/libretro/scummvm.git
synced 2024-11-27 11:20:40 +00:00
Don't subclass ArjFile from Common::File (there seems to be no good reason for it). BTW, this code is an abomination and should be replaced by an Archive/SearchSet approach
svn-id: r34681
This commit is contained in:
parent
a4292055f7
commit
a177ebe156
@ -324,15 +324,15 @@ uint32 ArjFile::read(void *dataPtr, uint32 dataSize) {
|
||||
return _uncompressed->read(dataPtr, dataSize);
|
||||
}
|
||||
|
||||
bool ArjFile::eos() {
|
||||
bool ArjFile::eos() const {
|
||||
return _uncompressed->eos();
|
||||
}
|
||||
|
||||
int32 ArjFile::pos() {
|
||||
int32 ArjFile::pos() const {
|
||||
return _uncompressed->pos();
|
||||
}
|
||||
|
||||
int32 ArjFile::size() {
|
||||
int32 ArjFile::size() const {
|
||||
return _uncompressed->size();
|
||||
}
|
||||
|
||||
|
@ -85,7 +85,7 @@ struct ArjHeader {
|
||||
|
||||
typedef HashMap<String, int, IgnoreCase_Hash, IgnoreCase_EqualTo> ArjFilesMap;
|
||||
|
||||
class ArjFile : public File {
|
||||
class ArjFile : public SeekableReadStream, public NonCopyable {
|
||||
public:
|
||||
ArjFile();
|
||||
~ArjFile();
|
||||
@ -98,9 +98,9 @@ public:
|
||||
void close();
|
||||
|
||||
uint32 read(void *dataPtr, uint32 dataSize);
|
||||
bool eos();
|
||||
int32 pos();
|
||||
int32 size();
|
||||
bool eos() const;
|
||||
int32 pos() const;
|
||||
int32 size() const;
|
||||
bool seek(int32 offset, int whence = SEEK_SET);
|
||||
bool isOpen() { return _isOpen; }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user