Merge pull request #947 from eightyeight/trigger-inheritance

Make Trigger friendlier towards inheritance

Engine/source/T3D/trigger.h

@@ -87,6 +87,10 @@ class Trigger : public GameBase
    String            mLeaveCommand;
    String            mTickCommand;
 
+   static const U32 CMD_SIZE = 1024;
+
+  protected:
+   
    enum TriggerUpdateBits
    {
       TransformMask = Parent::NextFreeMask << 0,
@@ -97,10 +101,6 @@ class Trigger : public GameBase
       NextFreeMask  = Parent::NextFreeMask << 5,
    };
 
-   static const U32 CMD_SIZE = 1024;
-
-  protected:
-
    static bool smRenderTriggers;
    bool testObject(GameBase* enter);
    void processTick(const Move *move);
@@ -142,7 +142,7 @@ class Trigger : public GameBase
    // Trigger
    void setTriggerPolyhedron(const Polyhedron&);
 
-   void      potentialEnterObject(GameBase*);
+   virtual void potentialEnterObject(GameBase*);
    U32       getNumTriggeringObjects() const;
    GameBase* getObject(const U32);   
    const Vector<GameBase*>& getObjects() const { return mObjects; }