Merge pull request #1128 from Azaezel/alpha41/clusterCluck

clean up "Add" menubar categoes on the 3d object side via the following:

Engine/source/T3D/accumulationVolume.h

@@ -74,7 +74,7 @@ class AccumulationVolume : public ScenePolyhedralSpace
       // SimObject.
       DECLARE_CONOBJECT( AccumulationVolume );
       DECLARE_DESCRIPTION( "Allows objects in an area to have accumulation effect applied." );
-      DECLARE_CATEGORY( "3D Scene" );
+      DECLARE_CATEGORY("Volume");
 
       virtual bool onAdd();
       virtual void onRemove();

Engine/source/T3D/aiPlayer.h

@@ -150,6 +150,7 @@ protected:
 
 public:
    DECLARE_CONOBJECT( AIPlayer );
+   DECLARE_CATEGORY("Actor \t AI");
 
    AIPlayer();
    ~AIPlayer();

Engine/source/T3D/camera.h

@@ -249,7 +249,7 @@ class Camera: public ShapeBase
       virtual void unpackUpdate( NetConnection* conn, BitStream* stream );
 
       DECLARE_CONOBJECT( Camera );
-      DECLARE_CATEGORY( "Game" );
+      DECLARE_CATEGORY("Actor \t Controllable");
       DECLARE_DESCRIPTION( "Represents a position, direction and field of view to render a scene from." );
       static F32 getMovementSpeed() { return smMovementSpeed; }
       bool isCamera() const { return true; }

Engine/source/T3D/convexShape.h

@@ -194,6 +194,7 @@ public:
    virtual ~ConvexShape();
 
    DECLARE_CONOBJECT( ConvexShape );
+   DECLARE_CATEGORY("Object \t Simple");
 
    // ConsoleObject
    static void initPersistFields();

Engine/source/T3D/debris.h

@@ -179,6 +179,7 @@ public:
    void  setRotAngles( const Point3F &angles ){ mRotAngles = angles; }
 
    DECLARE_CONOBJECT(Debris);
+   DECLARE_CATEGORY("UNLISTED");
 
 private:
    SimObject*   ss_object;

Engine/source/T3D/decal/decalManager.cpp

@@ -87,6 +87,7 @@ const U32 DecalManager::smMaxIndices = 10000;
 DecalManager *gDecalManager = NULL;
 
 IMPLEMENT_CONOBJECT(DecalManager);
+DECLARE_CATEGORY("UNLISTED");
 
 ConsoleDoc(
    "@defgroup Decals\n"

Engine/source/T3D/decal/decalManager.h

@@ -270,6 +270,7 @@ class DecalManager : public SceneObject
 
       // SimObject.
       DECLARE_CONOBJECT( DecalManager );
+      DECLARE_CATEGORY("UNLISTED");
       static void consoleInit();
 };
 

Engine/source/T3D/fx/explosion.h

@@ -205,6 +205,7 @@ class Explosion : public GameBase, public ISceneLight
    void setCollideType( U32 cType ){ mCollideType = cType; }
 
    DECLARE_CONOBJECT(Explosion);
+   DECLARE_CATEGORY("UNLISTED");
    static void initPersistFields();
 private:
    SimObject*     ss_object;

Engine/source/T3D/fx/fxFoliageReplicator.h

@@ -390,6 +390,7 @@ public:
 
    // Declare Console Object.
    DECLARE_CONOBJECT(fxFoliageReplicator);
+   DECLARE_CATEGORY("UNLISTED");
 };
 #pragma warning( pop ) 
 #endif // _FOLIAGEREPLICATOR_H_

Engine/source/T3D/fx/fxShapeReplicator.h

@@ -59,6 +59,7 @@ public:
    void setTransform(const MatrixF & mat) { Parent::setTransform(mat); setRenderTransform(mat); };
 
    DECLARE_CONOBJECT(fxShapeReplicatedStatic);
+   DECLARE_CATEGORY("UNLISTED");
 };
 
 
@@ -187,6 +188,7 @@ public:
 
    // Declare Console Object.
    DECLARE_CONOBJECT(fxShapeReplicator);
+   DECLARE_CATEGORY("UNLISTED");
 };
 
 #endif // _SHAPEREPLICATOR_H_

Engine/source/T3D/fx/groundCover.h

@@ -123,6 +123,7 @@ public:
    ~GroundCover();
 
    DECLARE_CONOBJECT(GroundCover);
+   DECLARE_CATEGORY("Environment \t BackGround");
 
    static void consoleInit();
    static void initPersistFields();

Engine/source/T3D/fx/lightning.h

@@ -239,6 +239,7 @@ class Lightning : public GameBase
    void processEvent(LightningStrikeEvent*);
 
    DECLARE_CONOBJECT(Lightning);
+   DECLARE_CATEGORY("Environment \t Weather");
    static void initPersistFields();
 
    U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);

Engine/source/T3D/fx/particleEmitter.h

@@ -168,6 +168,7 @@ class ParticleEmitter : public GameBase
    ~ParticleEmitter();
 
    DECLARE_CONOBJECT(ParticleEmitter);
+   DECLARE_CATEGORY("UNLISTED");
 
    static Point3F mWindVelocity;
    static void setWindVelocity( const Point3F &vel ){ mWindVelocity = vel; }

Engine/source/T3D/fx/particleEmitterNode.h

@@ -103,6 +103,7 @@ class ParticleEmitterNode : public GameBase
    void advanceTime(F32 dt);
 
    DECLARE_CONOBJECT(ParticleEmitterNode);
+   DECLARE_CATEGORY("Environment \t FX");
    static void initPersistFields();
 
    U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream);

Engine/source/T3D/fx/precipitation.h

@@ -280,6 +280,7 @@ class Precipitation : public GameBase
 
    bool onNewDataBlock( GameBaseData *dptr, bool reload );
    DECLARE_CONOBJECT(Precipitation);
+   DECLARE_CATEGORY("Environment \t Weather");
    static void initPersistFields();
    
    U32  packUpdate(NetConnection*, U32 mask, BitStream* stream);

Engine/source/T3D/fx/ribbon.h

@@ -124,6 +124,7 @@ public:
    ~Ribbon();
 
    DECLARE_CONOBJECT(Ribbon);
+   DECLARE_CATEGORY("UNLISTED");
    static void initPersistFields();
    bool onNewDataBlock(GameBaseData*,bool);
    void onRemove();

Engine/source/T3D/fx/ribbonNode.h

@@ -87,6 +87,7 @@ public:
    void advanceTime(F32 dt);
 
    DECLARE_CONOBJECT(RibbonNode);
+   DECLARE_CATEGORY("Environment \t FX");
    static void initPersistFields();
 
    U32  packUpdate  (NetConnection *conn, U32 mask, BitStream* stream);

Engine/source/T3D/fx/splash.h

@@ -195,6 +195,7 @@ public:
 
    bool onNewDataBlock( GameBaseData *dptr, bool reload );
    DECLARE_CONOBJECT(Splash);
+   DECLARE_CATEGORY("UNLISTED");
 };
 
 

Engine/source/T3D/gameBase/gameBase.h

@@ -105,6 +105,7 @@ public:
 
    // The derived class should provide the following:
    DECLARE_CONOBJECT(GameBaseData);
+   DECLARE_CATEGORY("Datablock");
    GameBaseData();
    static void initPersistFields();
    bool preload(bool server, String &errorStr);
@@ -442,6 +443,7 @@ public:
    #endif
 
    DECLARE_CONOBJECT (GameBase );
+   DECLARE_CATEGORY("UNLISTED");
 
    /// @name Callbacks
    /// @{

Engine/source/T3D/groundPlane.h

@@ -60,6 +60,7 @@ public:
    typedef SceneObject Parent;
 
    DECLARE_CONOBJECT( GroundPlane );
+   DECLARE_CATEGORY("Environment \t BackGround");
 
    GroundPlane();
    virtual ~GroundPlane();

Engine/source/T3D/item.h

@@ -159,6 +159,7 @@ class Item: public ShapeBase
 
   public:
    DECLARE_CONOBJECT(Item);
+   DECLARE_CATEGORY("Item");
 
 
    Item();

Engine/source/T3D/lightBase.h

@@ -111,6 +111,7 @@ public:
    void inspectPostApply();
    static void initPersistFields();
    DECLARE_CONOBJECT(LightBase);
+   DECLARE_CATEGORY("UNLISTED");
 
    // NetObject
    U32 packUpdate( NetConnection *conn, U32 mask, BitStream *stream );

Engine/source/T3D/lighting/boxEnvironmentProbe.h

@@ -69,6 +69,7 @@ public:
    // Declare this object as a ConsoleObject so that we can
    // instantiate it into the world and network it
    DECLARE_CONOBJECT(BoxEnvironmentProbe);
+   DECLARE_CATEGORY("Lighting \t Probes");
 
    //--------------------------------------------------------------------------
    // Object Editing

Engine/source/T3D/lighting/reflectionProbe.h

@@ -274,6 +274,7 @@ public:
    // Declare this object as a ConsoleObject so that we can
    // instantiate it into the world and network it
    DECLARE_CONOBJECT(ReflectionProbe);
+   DECLARE_CATEGORY("UNLISTED");
 
    //--------------------------------------------------------------------------
    // Object Editing

Engine/source/T3D/lighting/skylight.h

@@ -68,6 +68,7 @@ public:
    // Declare this object as a ConsoleObject so that we can
    // instantiate it into the world and network it
    DECLARE_CONOBJECT(Skylight);
+   DECLARE_CATEGORY("Lighting \t Probes");
 
    //--------------------------------------------------------------------------
    // Object Editing

Engine/source/T3D/lighting/sphereEnvironmentProbe.h

@@ -64,6 +64,7 @@ public:
    // Declare this object as a ConsoleObject so that we can
    // instantiate it into the world and network it
    DECLARE_CONOBJECT(SphereEnvironmentProbe);
+   DECLARE_CATEGORY("Lighting \t Probes");
 
    //--------------------------------------------------------------------------
    // Object Editing

Engine/source/T3D/missionMarker.h

@@ -85,6 +85,7 @@ class MissionMarker : public ShapeBase
       void unpackUpdate(NetConnection *conn,           BitStream *stream);
 
       DECLARE_CONOBJECT(MissionMarker);
+      DECLARE_CATEGORY("Markers");
       static void initPersistFields();
 };
 
@@ -217,6 +218,7 @@ class CameraBookmark : public MissionMarker
       static void initPersistFields();
 
       DECLARE_CONOBJECT(CameraBookmark);
+      DECLARE_CATEGORY("Markers");
 	  /*DECLARE_CALLBACK( void, onAdd, () );
 	  DECLARE_CALLBACK( void, onRemove, () );
 	  DECLARE_CALLBACK( void, onGroupAdd, () );

Engine/source/T3D/notesObject.h

@@ -67,6 +67,7 @@ public:
    // Declare this object as a ConsoleObject so that we can
    // instantiate it into the world and network it
    DECLARE_CONOBJECT(NotesObject);
+   DECLARE_CATEGORY("Markers");
 
    //--------------------------------------------------------------------------
    // Object Editing

Engine/source/T3D/occlusionVolume.h

@@ -64,7 +64,7 @@ class OcclusionVolume : public ScenePolyhedralSpace
       // SimObject.
       DECLARE_CONOBJECT( OcclusionVolume );
       DECLARE_DESCRIPTION( "A visibility blocking volume." );
-      DECLARE_CATEGORY( "3D Scene" );
+      DECLARE_CATEGORY("Volume");
 
       virtual bool onAdd();
 

Engine/source/T3D/pathCamera.h

@@ -92,6 +92,7 @@ private:
 
 public:
    DECLARE_CONOBJECT(PathCamera);
+   DECLARE_CATEGORY("Cinematic");
    
    DECLARE_CALLBACK( void, onNode, (S32 node));
 

Engine/source/T3D/pathShape.h

@@ -79,6 +79,7 @@ private:
 
 public:
    DECLARE_CONOBJECT(PathShape);
+   DECLARE_CATEGORY("Cinematic");
 
    PathShape();
    ~PathShape();

Engine/source/T3D/physicalZone.h

@@ -77,6 +77,7 @@ class PhysicalZone : public SceneObject
 
    // SimObject
    DECLARE_CONOBJECT(PhysicalZone);
+   DECLARE_CATEGORY("Volume");
    static void consoleInit();
    static void initPersistFields();
    bool onAdd();

Engine/source/T3D/physics/physicsDebris.h

@@ -129,6 +129,7 @@ public:
    virtual ~PhysicsDebris();
 
    DECLARE_CONOBJECT(PhysicsDebris);
+   DECLARE_CATEGORY("UNLISTED");
    static void initPersistFields();
 
    bool onAdd();

Engine/source/T3D/physics/physicsForce.h

@@ -48,7 +48,7 @@ public:
    virtual ~PhysicsForce();
 
    DECLARE_CONOBJECT( PhysicsForce );
-
+   DECLARE_CATEGORY("UNLISTED");
    // SimObject
    static void initPersistFields();
    bool onAdd();

Engine/source/T3D/physics/physicsShape.h

@@ -229,6 +229,7 @@ public:
    virtual ~PhysicsShape();
 
    DECLARE_CONOBJECT( PhysicsShape );
+   DECLARE_CATEGORY("Object \t Destructable");
 
    /// Returns the PhysicsShapeData datablock.
    PhysicsShapeData* getDataBlock() { return static_cast<PhysicsShapeData*>( Parent::getDataBlock() ); }

Engine/source/T3D/player.h

@@ -697,6 +697,7 @@ protected:
 
 public:
    DECLARE_CONOBJECT(Player);
+   DECLARE_CATEGORY("Actor \t Controllable");
 
    Player();
    ~Player();

Engine/source/T3D/pointLight.h

@@ -47,6 +47,7 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT( PointLight );
+   DECLARE_CATEGORY("Lighting \t Lights");
    static void initPersistFields();
 
    // SceneObject

Engine/source/T3D/portal.h

@@ -185,6 +185,7 @@ class Portal : public Zone
 
       // SimObject.
       DECLARE_CONOBJECT( Portal );
+      DECLARE_CATEGORY("Volume");
 
       static void initPersistFields();
       static void consoleInit();

Engine/source/T3D/prefab.h

@@ -57,6 +57,7 @@ public:
    virtual ~Prefab();
 
    DECLARE_CONOBJECT(Prefab);
+   DECLARE_CATEGORY("Object \t Collection");
   
    static void initPersistFields();
 

Engine/source/T3D/projectile.h

@@ -187,6 +187,7 @@ public:
    ~Projectile();
 
    DECLARE_CONOBJECT(Projectile);
+   DECLARE_CATEGORY("UNLISTED");
 
    // SimObject
    bool onAdd();

Engine/source/T3D/rigidShape.h

@@ -308,6 +308,7 @@ public:
    void unpackUpdate(NetConnection *conn,           BitStream *stream);
 
    DECLARE_CONOBJECT(RigidShape);
+   DECLARE_CATEGORY("Object \t Destructable");
 };
 
 

Engine/source/T3D/scopeAlwaysShape.cpp

@@ -30,6 +30,7 @@ class ScopeAlwaysShape : public StaticShape
       ScopeAlwaysShape();
       static void initPersistFields();
       DECLARE_CONOBJECT(ScopeAlwaysShape);
+      DECLARE_CATEGORY("UNLISTED");
 };
 
 ScopeAlwaysShape::ScopeAlwaysShape()

Engine/source/T3D/sfx/sfxEmitter.h

@@ -260,7 +260,7 @@ class SFXEmitter : public SceneObject
 
       DECLARE_CONOBJECT( SFXEmitter );
       DECLARE_DESCRIPTION( "A 3D object emitting sound." );
-      DECLARE_CATEGORY( "3D Sound" );
+      DECLARE_CATEGORY("Environment \t FX");
 };
 
 #endif // _SFXEMITTER_H_

Engine/source/T3D/sfx/sfxSpace.h

@@ -55,7 +55,7 @@ class SFXSpace : public SceneAmbientSoundObject< ScenePolyhedralObject< SceneSpa
       // SimObject.
       DECLARE_CONOBJECT( SFXSpace );
       DECLARE_DESCRIPTION( "A box volume that defines an ambient sound space." );
-      DECLARE_CATEGORY( "3D Sound" );
+      DECLARE_CATEGORY("Volume");
 
       static void consoleInit();
 };

Engine/source/T3D/shapeBase.cpp

@@ -2301,9 +2301,8 @@ void ShapeBase::updateAudioState(SoundThread& st)
       if ( isGhost() ) 
       {
          // if asset is valid, play
-         if (st.asset.notNull())
+         if (st.asset->isAssetValid() )
          {
-            st.asset->loadSound();
             st.sound = SFX->createSource( st.asset->getSFXTrack() , &getTransform() );
             if ( st.sound )
                st.sound->play();

Engine/source/T3D/spotLight.h

@@ -51,6 +51,7 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT( SpotLight );
+   DECLARE_CATEGORY("Lighting \t Lights");
    static void initPersistFields();
 
    // SceneObject

Engine/source/T3D/staticShape.h

@@ -75,6 +75,7 @@ protected:
 
 public:
    DECLARE_CONOBJECT(StaticShape);
+   DECLARE_CATEGORY("Object \t Destructable");
 
    StaticShape();
    ~StaticShape();

Engine/source/T3D/trigger.h

@@ -127,6 +127,7 @@ class Trigger : public GameBase
 
    // SimObject
    DECLARE_CONOBJECT(Trigger);
+   DECLARE_CATEGORY("Volume");
 
    DECLARE_CALLBACK( void, onAdd, ( U32 objectId ) );
    DECLARE_CALLBACK( void, onRemove, ( U32 objectId ) );

Engine/source/T3D/tsStatic.h

@@ -236,6 +236,7 @@ public:
    ~TSStatic();
 
    DECLARE_CONOBJECT(TSStatic);
+   DECLARE_CATEGORY("Object \t Simple");
    static void initPersistFields();
    /// returns the shape asset used for this object
    StringTableEntry getTypeHint() const override { return (getShapeAsset()) ? getShapeAsset()->getAssetName(): StringTable->EmptyString(); }

Engine/source/T3D/vehicles/flyingVehicle.h

@@ -180,6 +180,7 @@ class FlyingVehicle: public Vehicle
    U32 getCollisionMask();
   public:
    DECLARE_CONOBJECT(FlyingVehicle);
+   DECLARE_CATEGORY("Actor \t Controllable");
    static void initPersistFields();
 
    FlyingVehicle();

Engine/source/T3D/vehicles/hoverVehicle.h

@@ -200,6 +200,7 @@ class HoverVehicle : public Vehicle
    void advanceTime(F32 dt);
 
    DECLARE_CONOBJECT(HoverVehicle);
+   DECLARE_CATEGORY("Actor \t Controllable");
 //   static void initPersistFields();
 
    U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);

Engine/source/T3D/vehicles/vehicle.h

@@ -165,6 +165,7 @@ public:
    /// @}
 
    DECLARE_CONOBJECT(Vehicle);
+   DECLARE_CATEGORY("UNLISTED");
 };
 
 

Engine/source/T3D/vehicles/vehicleBlocker.h

@@ -52,6 +52,7 @@ class VehicleBlocker : public SceneObject
    ~VehicleBlocker();
 
    DECLARE_CONOBJECT(VehicleBlocker);
+   DECLARE_CATEGORY("Volume");
    static void initPersistFields();
 
    U32  packUpdate  (NetConnection *conn, U32 mask, BitStream *stream);

Engine/source/T3D/vehicles/wheeledVehicle.h

@@ -225,6 +225,7 @@ class WheeledVehicle: public Vehicle
 
 public:
    DECLARE_CONOBJECT(WheeledVehicle);
+   DECLARE_CATEGORY("Actor \t Controllable");
    static void initPersistFields();
 
    WheeledVehicle();

Engine/source/T3D/zone.h

@@ -68,7 +68,7 @@ class Zone : public SceneAmbientSoundObject< ScenePolyhedralZone >
       // SimObject
       DECLARE_CONOBJECT( Zone );
       DECLARE_DESCRIPTION( "A volume that encloses objects for visibility culling." );
-      DECLARE_CATEGORY( "3D" );
+      DECLARE_CATEGORY("Volume");
 
       static void consoleInit();
 };

Engine/source/afx/afxCamera.h

@@ -51,7 +51,6 @@ struct afxCameraData: public ShapeBaseData {
 
   //
   DECLARE_CONOBJECT(afxCameraData);
-  DECLARE_CATEGORY("AFX");
   static void initPersistFields();
   virtual void packData(BitStream* stream);
   virtual void unpackData(BitStream* stream);
@@ -144,7 +143,7 @@ public:
   bool            isCamera() const { return true; }
 
   DECLARE_CONOBJECT(afxCamera);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 
 private:          // 3POV SECTION
   void            cam_update_3pov(F32 dt, bool on_server);

Engine/source/afx/afxChoreographer.h

@@ -57,7 +57,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxChoreographerData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -200,7 +199,7 @@ public:
   virtual void  impactNotify(const Point3F& p, const Point3F& n, SceneObject*) { }
 
   DECLARE_CONOBJECT(afxChoreographer);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
   
   // CONSTRAINT REMAPPING <<
 protected:

Engine/source/afx/afxEffectGroup.h

@@ -96,7 +96,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxEffectGroupData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxEffectWrapper.h

@@ -100,7 +100,6 @@ public:
   virtual void    gather_cons_defs(Vector<afxConstraintDef>& defs) { };
 
   DECLARE_CONOBJECT(afxEffectBaseData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //class afxEffectWrapperData : public GameBaseData, public afxEffectDefs
@@ -207,7 +206,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxEffectWrapperData);
-  DECLARE_CATEGORY("AFX");
 };
 
 inline bool afxEffectWrapperData::testExecConditions(U32 conditions)
@@ -382,7 +380,6 @@ public:
   static afxEffectWrapper* ew_create(afxChoreographer*, afxEffectWrapperData*, afxConstraintMgr*, F32 time_factor, S32 group_index=0);
 
   DECLARE_CONOBJECT(afxEffectWrapper);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxEffectron.h

@@ -82,7 +82,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxEffectronData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -178,7 +177,6 @@ public:
   void          finish_startup();
 
   DECLARE_CONOBJECT(afxEffectron);
-  DECLARE_CATEGORY("AFX");
 
 private:
   void          process_server();

Engine/source/afx/afxMagicMissile.h

@@ -218,7 +218,6 @@ public:
   static void           initPersistFields();
   
   DECLARE_CONOBJECT(afxMagicMissileData);
-  DECLARE_CATEGORY("AFX");
 
 public:
   /*C*/                 afxMagicMissileData(const afxMagicMissileData&, bool = false);
@@ -400,7 +399,7 @@ public:
   virtual void      onDeleteNotify(SimObject*);
 
   DECLARE_CONOBJECT(afxMagicMissile);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 
   static void       initPersistFields();  
 

Engine/source/afx/afxMagicSpell.h

@@ -122,7 +122,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxMagicSpellData);
-  DECLARE_CATEGORY("AFX");
 
   /// @name Callbacks
   /// @{
@@ -320,7 +319,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxMagicSpell);
-  DECLARE_CATEGORY("AFX");
 
 private:
   void          process_server();

Engine/source/afx/afxResidueMgr.h

@@ -171,7 +171,7 @@ public:
   static void           setMaster(afxResidueMgr* m) { the_mgr = m; }
 
   DECLARE_CONOBJECT(afxResidueMgr);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxSelectron.h

@@ -106,7 +106,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxSelectronData);
-  DECLARE_CATEGORY("AFX");
 };
 
 inline bool afxSelectronData::matches(U32 mask, U8 style)
@@ -219,7 +218,7 @@ public:
   void          finish_startup();
 
   DECLARE_CONOBJECT(afxSelectron);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 
 private:
   void          process_server();

Engine/source/afx/afxSpellBook.h

@@ -68,7 +68,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxSpellBookData);
-  DECLARE_CATEGORY("AFX");
 };
 
 inline bool afxSpellBookData::verifyPageSlot(S32 page, S32 slot)
@@ -128,7 +127,7 @@ public:
   F32                     getCooldownFactor(S32 page, S32 slot);
 
   DECLARE_CONOBJECT(afxSpellBook);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 inline S32 afxSpellBook::getPageSlotIndex(S32 page, S32 slot)

Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.h

@@ -83,7 +83,6 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT(afxZodiacGroundPlaneRenderer);
-   DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.h

@@ -84,7 +84,6 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT(afxZodiacMeshRoadRenderer);
-   DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxZodiacPolysoupRenderer_T3D.h

@@ -84,7 +84,6 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT(afxZodiacPolysoupRenderer);
-   DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/afxZodiacTerrainRenderer_T3D.h

@@ -84,7 +84,6 @@ public:
 
    // ConsoleObject
    DECLARE_CONOBJECT(afxZodiacTerrainRenderer);
-   DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/arcaneFX.cpp

@@ -83,7 +83,6 @@ public:
   }
 
   DECLARE_CONOBJECT(ClientZoneInEvent);
-  DECLARE_CATEGORY("AFX");
 };
 IMPLEMENT_CO_SERVEREVENT_V1(ClientZoneInEvent);
 

Engine/source/afx/ce/afxAnimClip.h

@@ -73,7 +73,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxAnimClipData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxAnimLock.h

@@ -40,7 +40,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxAnimLockData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxAreaDamage.h

@@ -54,7 +54,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxAreaDamageData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxAudioBank.h

@@ -59,7 +59,6 @@ public:
    virtual bool       allowSubstitutions() const { return true; }
 
    DECLARE_CONOBJECT(afxAudioBank);
-   DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxBillboard.h

@@ -74,7 +74,6 @@ public:
   void onChangeTexture() {}
 
   DECLARE_CONOBJECT(afxBillboardData);
-  DECLARE_CATEGORY("AFX");
 };
 
 typedef afxBillboardData::BlendStyle afxBillboard_BlendStyle;
@@ -117,7 +116,7 @@ public:
   void              _renderBillboard(ObjectRenderInst*, SceneRenderState*, BaseMatInstance*);
 
   DECLARE_CONOBJECT(afxBillboard);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxCameraPuppet.h

@@ -55,7 +55,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxCameraPuppetData);
-  DECLARE_CATEGORY("AFX");
 };
 
 

Engine/source/afx/ce/afxCameraShake.h

@@ -49,7 +49,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxCameraShakeData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxCollisionEvent.h

@@ -51,7 +51,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxCollisionEventData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxConsoleMessage.h

@@ -46,7 +46,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxConsoleMessageData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxDamage.h

@@ -55,7 +55,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxDamageData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxFootSwitch.h

@@ -48,7 +48,6 @@ public:
   static void     initPersistFields();
 
   DECLARE_CONOBJECT(afxFootSwitchData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxGuiController.h

@@ -50,7 +50,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxGuiControllerData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxGuiText.h

@@ -49,7 +49,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxGuiTextData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxLight.h

@@ -30,7 +30,6 @@ struct afxLightData : public GameBaseData
 {
   typedef GameBaseData Parent;
   DECLARE_CONOBJECT(afxLightData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxLightBase_T3D.h

@@ -65,7 +65,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxT3DLightBaseData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxMachineGun.h

@@ -51,7 +51,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxMachineGunData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxModel.h

@@ -98,7 +98,6 @@ public:
   void onSequenceChanged() {}
 
   DECLARE_CONOBJECT(afxModelData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -162,7 +161,7 @@ public:
   F32                   getAnimClipDuration(const char* clip);
 
   DECLARE_CONOBJECT(afxModel);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxMooring.h

@@ -52,7 +52,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxMooringData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -94,7 +93,7 @@ public:
   virtual void          prepRenderImage(SceneRenderState*);
 
   DECLARE_CONOBJECT(afxMooring);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxMultiLight.h

@@ -30,7 +30,6 @@ struct afxMultiLightData : public GameBaseData
 {
   typedef GameBaseData Parent;
   DECLARE_CONOBJECT(afxMultiLightData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxParticleEmitter.h

@@ -67,7 +67,6 @@ public:
   static void initPersistFields();
 
   DECLARE_CONOBJECT(afxParticleEmitterData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -92,7 +91,6 @@ public:
   static void initPersistFields();
 
   DECLARE_CONOBJECT(afxParticleEmitterVectorData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -121,7 +119,6 @@ public:
   static void initPersistFields();
 
   DECLARE_CONOBJECT(afxParticleEmitterConeData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -165,7 +162,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxParticleEmitterPathData);
-  DECLARE_CATEGORY("AFX");
 };
 
 typedef afxParticleEmitterPathData::PathOriginType afxParticleEmitterPath_OriginType;
@@ -197,7 +193,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxParticleEmitterDiscData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxPhraseEffect.h

@@ -103,7 +103,6 @@ public:
   static void     initPersistFields();
 
   DECLARE_CONOBJECT(afxPhraseEffectData);
-  DECLARE_CATEGORY("AFX");
 };
 
 typedef afxPhraseEffectData::MatchType afxPhraseEffect_MatchType;

Engine/source/afx/ce/afxPhysicalZone.h

@@ -57,7 +57,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxPhysicalZoneData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxPlayerMovement.h

@@ -62,7 +62,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxPlayerMovementData);
-  DECLARE_CATEGORY("AFX");
 };
 
 typedef afxPlayerMovementData::OpType afxPlayerMovement_OpType;

Engine/source/afx/ce/afxPlayerPuppet.h

@@ -55,7 +55,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxPlayerPuppetData);
-  DECLARE_CATEGORY("AFX");
 };
 
 

Engine/source/afx/ce/afxPointLight_T3D.h

@@ -48,7 +48,6 @@ public:
   static void initPersistFields();
 
   DECLARE_CONOBJECT(afxT3DPointLightData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxProjectile.h

@@ -72,7 +72,6 @@ public:
   static void       initPersistFields();
 
   DECLARE_CONOBJECT(afxProjectileData);
-  DECLARE_CATEGORY("AFX");
 };
 
 typedef afxProjectileData::LaunchDirType afxProjectile_LaunchDirType;
@@ -109,7 +108,7 @@ public:
   virtual void        explode(const Point3F& p, const Point3F& n, const U32 collideType);
 
   DECLARE_CONOBJECT(afxProjectile);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxScriptEvent.h

@@ -49,7 +49,6 @@ public:
   static void           initPersistFields();
 
   DECLARE_CONOBJECT(afxScriptEventData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxSpotLight_T3D.h

@@ -50,7 +50,6 @@ public:
   static void   initPersistFields();
 
   DECLARE_CONOBJECT(afxT3DSpotLightData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxStaticShape.h

@@ -54,7 +54,6 @@ public:
   static void initPersistFields();
 
   DECLARE_CONOBJECT(afxStaticShapeData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
@@ -90,7 +89,7 @@ public:
   void                  setVisibility(bool flag) { mIs_visible = flag; }
 
   DECLARE_CONOBJECT(afxStaticShape);
-  DECLARE_CATEGORY("AFX");
+  DECLARE_CATEGORY("UNLISTED");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//

Engine/source/afx/ce/afxVolumeLight.h

@@ -30,7 +30,6 @@ struct afxVolumeLightData : public GameBaseData
 {
   typedef GameBaseData Parent;
   DECLARE_CONOBJECT(afxVolumeLightData);
-  DECLARE_CATEGORY("AFX");
 };
 
 //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//