thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Making some static const uint32s public, older GCC versions don't seem to like nested classes to access their parents' protected members

Browse source 
svn-id: r42640
This commit is contained in:
Sven Hesse 2009-07-21 11:26:31 +00:00
parent fd63d8c95a
commit 87af626ee9
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
engines/gob/save/saveload.h
View file

@ -74,15 +74,15 @@ protected:
/** Save/Load class for Gobliins 2, Ween: The Prophecy and Bargon Attack. */ /** Save/Load class for Gobliins 2, Ween: The Prophecy and Bargon Attack. */
class SaveLoad_v2 : public SaveLoad { class SaveLoad_v2 : public SaveLoad {
public: public:
static const uint32 kSlotCount = 15;
static const uint32 kSlotNameLength = 40;
SaveLoad_v2(GobEngine *vm, const char *targetName); SaveLoad_v2(GobEngine *vm, const char *targetName);
virtual ~SaveLoad_v2(); virtual ~SaveLoad_v2();
SaveMode getSaveMode(const char *fileName) const; SaveMode getSaveMode(const char *fileName) const;
protected: protected:
static const uint32 kSlotCount = 15;
static const uint32 kSlotNameLength = 40;
struct SaveFile { struct SaveFile {
const char *sourceName; const char *sourceName;
SaveMode mode; SaveMode mode;
@ -136,6 +136,9 @@ protected:
/** Save/Load class for Goblins 3 and Lost in Time. */ /** Save/Load class for Goblins 3 and Lost in Time. */
class SaveLoad_v3 : public SaveLoad { class SaveLoad_v3 : public SaveLoad {
public: public:
static const uint32 kSlotCount = 30;
static const uint32 kSlotNameLength = 40;
enum ScreenshotType { enum ScreenshotType {
kScreenshotTypeGob3, //!< Goblins 3 type screenshot kScreenshotTypeGob3, //!< Goblins 3 type screenshot
kScreenshotTypeLost //!< Lost in Time type screenshot kScreenshotTypeLost //!< Lost in Time type screenshot
@ -147,9 +150,6 @@ public:
SaveMode getSaveMode(const char *fileName) const; SaveMode getSaveMode(const char *fileName) const;
protected: protected:
static const uint32 kSlotCount = 30;
static const uint32 kSlotNameLength = 40;
struct SaveFile { struct SaveFile {
const char *sourceName; const char *sourceName;
SaveMode mode; SaveMode mode;
@ -264,15 +264,15 @@ protected:
/** Save/Load class for Woodruff. */ /** Save/Load class for Woodruff. */
class SaveLoad_v4 : public SaveLoad { class SaveLoad_v4 : public SaveLoad {
public: public:
static const uint32 kSlotCount = 10;
static const uint32 kSlotNameLength = 40;
SaveLoad_v4(GobEngine *vm, const char *targetName); SaveLoad_v4(GobEngine *vm, const char *targetName);
virtual ~SaveLoad_v4(); virtual ~SaveLoad_v4();
SaveMode getSaveMode(const char *fileName) const; SaveMode getSaveMode(const char *fileName) const;
protected: protected:
static const uint32 kSlotCount = 10;
static const uint32 kSlotNameLength = 40;
struct SaveFile { struct SaveFile {
const char *sourceName; const char *sourceName;
SaveMode mode; SaveMode mode;
@ -386,15 +386,15 @@ protected:
/** Save/Load class for Urban Runner. */ /** Save/Load class for Urban Runner. */
class SaveLoad_v6 : public SaveLoad { class SaveLoad_v6 : public SaveLoad {
public: public:
static const uint32 kSlotCount = 60;
static const uint32 kSlotNameLength = 40;
SaveLoad_v6(GobEngine *vm, const char *targetName); SaveLoad_v6(GobEngine *vm, const char *targetName);
virtual ~SaveLoad_v6(); virtual ~SaveLoad_v6();
SaveMode getSaveMode(const char *fileName) const; SaveMode getSaveMode(const char *fileName) const;
protected: protected:
static const uint32 kSlotCount = 60;
static const uint32 kSlotNameLength = 40;
struct SaveFile { struct SaveFile {
const char *sourceName; const char *sourceName;
SaveMode mode; SaveMode mode;