diff options
author | Ori Avtalion | 2011-02-26 20:01:02 +0200 |
---|---|---|
committer | Ori Avtalion | 2011-02-26 20:25:44 +0200 |
commit | 765540a5fd58238c51ea50f96e5a5940dbbf88ef (patch) | |
tree | 7739d9455d2d0128c3bca0f76573f65cbbe68c30 /engines/gob/save | |
parent | 9bd5e8ff15dc22cf43281365e5835fc028a7caad (diff) | |
download | scummvm-rg350-765540a5fd58238c51ea50f96e5a5940dbbf88ef.tar.gz scummvm-rg350-765540a5fd58238c51ea50f96e5a5940dbbf88ef.tar.bz2 scummvm-rg350-765540a5fd58238c51ea50f96e5a5940dbbf88ef.zip |
GOB: Avoid hiding overloaded virtual methods
Diffstat (limited to 'engines/gob/save')
-rw-r--r-- | engines/gob/save/saveload.h | 4 | ||||
-rw-r--r-- | engines/gob/save/saveload_inca2.cpp | 4 | ||||
-rw-r--r-- | engines/gob/save/saveload_v3.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/save/saveload.h b/engines/gob/save/saveload.h index c231c1dbbb..dc1c184504 100644 --- a/engines/gob/save/saveload.h +++ b/engines/gob/save/saveload.h @@ -305,7 +305,7 @@ protected: int getSlot(int32 offset) const; int getSlotRemainder(int32 offset) const; - void buildIndex(byte *buffer) const; + void buildScreenshotIndex(byte *buffer) const; protected: uint32 _shotSize; @@ -430,7 +430,7 @@ protected: int getSlot(int32 offset) const; int getSlotRemainder(int32 offset) const; - void buildIndex(byte *buffer) const; + void buildScreenshotIndex(byte *buffer) const; }; File *_file; diff --git a/engines/gob/save/saveload_inca2.cpp b/engines/gob/save/saveload_inca2.cpp index 68c76c3f2b..5fa1b69fa7 100644 --- a/engines/gob/save/saveload_inca2.cpp +++ b/engines/gob/save/saveload_inca2.cpp @@ -260,7 +260,7 @@ int SaveLoad_Inca2::ScreenshotHandler::File::getSlotRemainder(int32 offset) cons return (offset - 80) % 15168; } -void SaveLoad_Inca2::ScreenshotHandler::File::buildIndex(byte *buffer) const { +void SaveLoad_Inca2::ScreenshotHandler::File::buildScreenshotIndex(byte *buffer) const { Common::SaveFileManager *saveMan = g_system->getSavefileManager(); Common::InSaveFile *in; @@ -306,7 +306,7 @@ bool SaveLoad_Inca2::ScreenshotHandler::load(int16 dataVar, int32 size, int32 of } // Create/Fake the index - _file->buildIndex(_index + 40); + _file->buildScreenshotIndex(_index + 40); _vm->_inter->_variables->copyFrom(dataVar, _index + offset, size); diff --git a/engines/gob/save/saveload_v3.cpp b/engines/gob/save/saveload_v3.cpp index 098b8e1160..39edddb66f 100644 --- a/engines/gob/save/saveload_v3.cpp +++ b/engines/gob/save/saveload_v3.cpp @@ -367,7 +367,7 @@ int SaveLoad_v3::ScreenshotHandler::File::getSlotRemainder(int32 offset) const { return ((offset - _shotIndexSize) % _shotSize); } -void SaveLoad_v3::ScreenshotHandler::File::buildIndex(byte *buffer) const { +void SaveLoad_v3::ScreenshotHandler::File::buildScreenshotIndex(byte *buffer) const { Common::SaveFileManager *saveMan = g_system->getSavefileManager(); Common::InSaveFile *in; @@ -418,12 +418,12 @@ bool SaveLoad_v3::ScreenshotHandler::load(int16 dataVar, int32 size, int32 offse if (_sShotType == kScreenshotTypeGob3) { // Create/Fake the index - _file->buildIndex(_index + 40); + _file->buildScreenshotIndex(_index + 40); // The last 10 bytes are 0 memset(_index + 70, 0, 10); } else if (_sShotType == kScreenshotTypeLost) { // Create/Fake the index - _file->buildIndex(_index); + _file->buildScreenshotIndex(_index); // The last byte is 0 _index[30] = 0; } |