[Scummvm-cvs-logs] SF.net SVN: scummvm:[42640] scummvm/trunk/engines/gob/save/saveload.h

[drmccoy at users.sourceforge.net]

Revision: 42640
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42640&view=rev
Author:   drmccoy
Date:     2009-07-21 11:26:31 +0000 (Tue, 21 Jul 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/gob/save/saveload.h

Modified: scummvm/trunk/engines/gob/save/saveload.h
===================================================================
--- scummvm/trunk/engines/gob/save/saveload.h	2009-07-21 10:48:32 UTC (rev 42639)
+++ scummvm/trunk/engines/gob/save/saveload.h	2009-07-21 11:26:31 UTC (rev 42640)
@@ -74,15 +74,15 @@
 /** 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 @@
 /** 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 @@
 	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 @@
 /** 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 @@
 /** 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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.