- Removed both "Published" and "Purchased" which are 3-Step Studio specific fields related to its web-service.

engine/source/module/moduleDefinition.cc

@@ -48,8 +48,6 @@ ModuleDefinition::ModuleDefinition() :
     mVersionId( 0 ),
     mBuildId( 0 ),
     mEnabled( true ),
-    mPublished( true ),
-    mPurchased( false ),
     mSynchronized( false ),
     mDeprecated( false ),
     mCriticalMerge( false ),
@@ -88,9 +86,7 @@ void ModuleDefinition::initPersistFields()
     addProtectedField( "VersionId", TypeS32, Offset(mVersionId, ModuleDefinition), &setVersionId, &defaultProtectedGetFn, "The version Id.  Breaking changes to a module should use a higher version Id." );
     addProtectedField( "BuildId", TypeS32, Offset(mBuildId, ModuleDefinition), &setBuildId, &defaultProtectedGetFn, &writeBuildId, "The build Id.  Non-breaking changes to a module should use a higher build Id.  Optional: If not specified then the build Id will be zero." );
     addProtectedField( "Enabled", TypeBool, Offset(mEnabled, ModuleDefinition), &setEnabled, &defaultProtectedGetFn, &writeEnabled, "Whether the module is enabled or not.  When disabled, it is effectively ignored.  Optional: If not specified then the module is enabled." );
-    addProtectedField( "Published", TypeBool, Offset(mPublished, ModuleDefinition), &setPublished, &defaultProtectedGetFn, &writePublished, "Whether the module should be published to the web-services or not.  Optional: If not specified then the module is published." );
-    addProtectedField( "Purchased", TypeBool, Offset(mPurchased, ModuleDefinition), &setPurchased, &defaultProtectedGetFn, &writePurchased, "Whether the module should be purchased via the web-services or not.  Optional: If not specified then the module is purchased." );
-    addProtectedField( "Synchronized", TypeBool, Offset(mSynchronized, ModuleDefinition), &setSynchronized, &defaultProtectedGetFn, &writeSynchronized, "Whether the module is should be synchronized or not.  Optional: If not specified then the module is not synchronized." );
+    addProtectedField( "Synchronized", TypeBool, Offset(mSynchronized, ModuleDefinition), &setSynchronized, &defaultProtectedGetFn, &writeSynchronized, "Whether the module should be synchronized or not.  Optional: If not specified then the module is not synchronized." );
     addProtectedField( "Deprecated", TypeBool, Offset(mDeprecated, ModuleDefinition), &setDeprecated, &defaultProtectedGetFn, &writeDeprecated, "Whether the module is deprecated or not.  Optional: If not specified then the module is not deprecated." );
     addProtectedField( "CriticalMerge", TypeBool, Offset(mCriticalMerge, ModuleDefinition), &setDeprecated, &defaultProtectedGetFn, &writeCriticalMerge, "Whether the merging of a module prior to a restart is critical or not.  Optional: If not specified then the module is not merge critical." );
     addProtectedField( "Description", TypeString, Offset(mModuleDescription, ModuleDefinition), &setModuleDescription, &defaultProtectedGetFn, &writeModuleDescription, "The description displayed for debugging purposes." );

engine/source/module/moduleDefinition.h

@@ -84,8 +84,6 @@ private:
     U32                             mVersionId;
     U32                             mBuildId;
     bool                            mEnabled;
-    bool                            mPublished;
-    bool                            mPurchased;
     bool                            mSynchronized;
     bool                            mDeprecated;
     bool                            mCriticalMerge;
@@ -137,10 +135,6 @@ public:
     inline bool             getEnabled( void ) const                            { return mEnabled; }
     inline void             setSynchronized( const bool synchronized )          { if ( checkUnlocked() ) { mSynchronized = synchronized; } }
     inline bool             getSynchronized( void ) const                       { return mSynchronized; }
-    inline void             setPublished( const bool published )                { if ( checkUnlocked() ) { mPublished = published; } }
-    inline bool             getPublished( void ) const                          { return mPublished; }
-    inline void             setPurchased( const bool purchased )                { if ( checkUnlocked() ) { mPurchased = purchased; } }
-    inline bool             getPurchased( void ) const                          { return mPurchased; }
     inline void             setDeprecated( const bool deprecated )              { if ( checkUnlocked() ) { mDeprecated = deprecated; } }
     inline bool             getDeprecated( void ) const                         { return mDeprecated; }
     inline void             setCriticalMerge( const bool mergeCritical )        { if ( checkUnlocked() ) { mCriticalMerge = mergeCritical; } }
@@ -205,10 +199,6 @@ protected:
     static bool             writeBuildId( void* obj, StringTableEntry pFieldName )      { return static_cast<ModuleDefinition*>(obj)->getBuildId() != 0; }
     static bool             setEnabled(void* obj, const char* data)                     { static_cast<ModuleDefinition*>(obj)->setEnabled( dAtob(data) ); return false; }
     static bool             writeEnabled( void* obj, StringTableEntry pFieldName )      { return static_cast<ModuleDefinition*>(obj)->getEnabled() == false; }
-    static bool             setPublished(void* obj, const char* data)                   { static_cast<ModuleDefinition*>(obj)->setPublished( dAtob(data) ); return false; }
-    static bool             writePublished( void* obj, StringTableEntry pFieldName )    { return static_cast<ModuleDefinition*>(obj)->getPublished() == false; }
-    static bool             setPurchased(void* obj, const char* data)                   { static_cast<ModuleDefinition*>(obj)->setPurchased( dAtob(data) ); return false; }
-    static bool             writePurchased( void* obj, StringTableEntry pFieldName )    { return static_cast<ModuleDefinition*>(obj)->getPurchased() == true; }
     static bool             setSynchronized(void* obj, const char* data)                { static_cast<ModuleDefinition*>(obj)->setSynchronized( dAtob(data) ); return false; }
     static bool             writeSynchronized( void* obj, StringTableEntry pFieldName ) { return static_cast<ModuleDefinition*>(obj)->getSynchronized() == true; }
     static bool             setDeprecated(void* obj, const char* data)                  { static_cast<ModuleDefinition*>(obj)->setDeprecated( dAtob(data) ); return false; }