libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 19:00:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINTERMUTE: Remove TSeek enum

Browse Source
This commit is contained in:
Einar Johan Trøan Sømåen 2012-07-17 23:19:12 +02:00
parent 642714dc19
commit 90024a502a
4 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/wintermute/Base/file/BFile.h
View File

@ -51,7 +51,7 @@ public:
virtual uint32 getPos() { virtual uint32 getPos() {
return _pos; return _pos;
}; };
virtual ERRORCODE seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN) = 0; virtual ERRORCODE seek(uint32 pos, int whence = SEEK_SET) = 0;
virtual ERRORCODE read(void *buffer, uint32 size) = 0; virtual ERRORCODE read(void *buffer, uint32 size) = 0;
virtual ERRORCODE close() = 0; virtual ERRORCODE close() = 0;
virtual ERRORCODE open(const Common::String &filename) = 0; virtual ERRORCODE open(const Common::String &filename) = 0;

10
engines/wintermute/Base/file/BSaveThumbFile.cpp
View File

@ -120,19 +120,19 @@ ERRORCODE CBSaveThumbFile::read(void *buffer, uint32 size) {
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
ERRORCODE CBSaveThumbFile::seek(uint32 pos, TSeek origin) { ERRORCODE CBSaveThumbFile::seek(uint32 pos, int whence) {
if (!_data) return STATUS_FAILED; if (!_data) return STATUS_FAILED;
uint32 newPos = 0; uint32 newPos = 0;
switch (origin) { switch (whence) {
case SEEK_TO_BEGIN: case SEEK_SET:
newPos = pos; newPos = pos;
break; break;
case SEEK_TO_END: case SEEK_END:
newPos = _size + pos; newPos = _size + pos;
break; break;
case SEEK_TO_CURRENT: case SEEK_CUR:
newPos = _pos + pos; newPos = _pos + pos;
break; break;
} }

2
engines/wintermute/Base/file/BSaveThumbFile.h
View File

@ -39,7 +39,7 @@ class CBSaveThumbFile : public CBFile {
public: public:
CBSaveThumbFile(CBGame *Game); CBSaveThumbFile(CBGame *Game);
virtual ~CBSaveThumbFile(); virtual ~CBSaveThumbFile();
virtual ERRORCODE seek(uint32 pos, TSeek origin = SEEK_TO_BEGIN); virtual ERRORCODE seek(uint32 pos, int whence = SEEK_SET);
virtual ERRORCODE read(void *buffer, uint32 size); virtual ERRORCODE read(void *buffer, uint32 size);
virtual ERRORCODE close(); virtual ERRORCODE close();
virtual ERRORCODE open(const Common::String &filename); virtual ERRORCODE open(const Common::String &filename);

5
engines/wintermute/dctypes.h
View File

@ -134,11 +134,6 @@ enum TDynamicConstructor {
DYNAMIC_CONSTRUCTOR DYNAMIC_CONSTRUCTOR
}; };
enum TSeek {
SEEK_TO_BEGIN = SEEK_SET,
SEEK_TO_CURRENT = SEEK_CUR,
SEEK_TO_END = SEEK_END
};
enum TVideoMode { enum TVideoMode {
VIDEO_WINDOW, VIDEO_WINDOW,