diff options
| author | Sven Hesse | 2009-07-21 11:26:31 +0000 |
|---|---|---|
| committer | Sven Hesse | 2009-07-21 11:26:31 +0000 |
| commit | 87af626ee91838ecab882cd4deabc1e625c2cf55 (patch) | |
| tree | c9bef5191047a219474d7f1b723b5a5d79ad8cf6 /engines | |
| parent | fd63d8c95a7e15e2f1511cfa6dcc9724580bf757 (diff) | |
| download | scummvm-rg350-87af626ee91838ecab882cd4deabc1e625c2cf55.tar.gz scummvm-rg350-87af626ee91838ecab882cd4deabc1e625c2cf55.tar.bz2 scummvm-rg350-87af626ee91838ecab882cd4deabc1e625c2cf55.zip | |
Making some static const uint32s public, older GCC versions don't seem to like nested classes to access their parents' protected members
svn-id: r42640
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/gob/save/saveload.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engines/gob/save/saveload.h b/engines/gob/save/saveload.h index 8d785c7233..700462f315 100644 --- a/engines/gob/save/saveload.h +++ b/engines/gob/save/saveload.h @@ -74,15 +74,15 @@ protected: /** Save/Load class for Gobliins 2, Ween: The Prophecy and Bargon Attack. */ class SaveLoad_v2 : public SaveLoad { public: + static const uint32 kSlotCount = 15; + static const uint32 kSlotNameLength = 40; + SaveLoad_v2(GobEngine *vm, const char *targetName); virtual ~SaveLoad_v2(); SaveMode getSaveMode(const char *fileName) const; protected: - static const uint32 kSlotCount = 15; - static const uint32 kSlotNameLength = 40; - struct SaveFile { const char *sourceName; SaveMode mode; @@ -136,6 +136,9 @@ protected: /** Save/Load class for Goblins 3 and Lost in Time. */ class SaveLoad_v3 : public SaveLoad { public: + static const uint32 kSlotCount = 30; + static const uint32 kSlotNameLength = 40; + enum ScreenshotType { kScreenshotTypeGob3, //!< Goblins 3 type screenshot kScreenshotTypeLost //!< Lost in Time type screenshot @@ -147,9 +150,6 @@ public: SaveMode getSaveMode(const char *fileName) const; protected: - static const uint32 kSlotCount = 30; - static const uint32 kSlotNameLength = 40; - struct SaveFile { const char *sourceName; SaveMode mode; @@ -264,15 +264,15 @@ protected: /** Save/Load class for Woodruff. */ class SaveLoad_v4 : public SaveLoad { public: + static const uint32 kSlotCount = 10; + static const uint32 kSlotNameLength = 40; + SaveLoad_v4(GobEngine *vm, const char *targetName); virtual ~SaveLoad_v4(); SaveMode getSaveMode(const char *fileName) const; protected: - static const uint32 kSlotCount = 10; - static const uint32 kSlotNameLength = 40; - struct SaveFile { const char *sourceName; SaveMode mode; @@ -386,15 +386,15 @@ protected: /** Save/Load class for Urban Runner. */ class SaveLoad_v6 : public SaveLoad { public: + static const uint32 kSlotCount = 60; + static const uint32 kSlotNameLength = 40; + SaveLoad_v6(GobEngine *vm, const char *targetName); virtual ~SaveLoad_v6(); SaveMode getSaveMode(const char *fileName) const; protected: - static const uint32 kSlotCount = 60; - static const uint32 kSlotNameLength = 40; - struct SaveFile { const char *sourceName; SaveMode mode; |