Cf 143 Wounds, Attachables, Force Transfer, etc.

Entities/ACDropShip.h

@@ -109,17 +109,6 @@ ClassInfoGetters
     void Destroy(bool notInherited = false) override;
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  GetMass
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the mass value of this ACDropShip, including the mass of its
-//                  currently attached body parts and inventory.
-// Arguments:       None.
-// Return value:    A float describing the mass value in Kilograms (kg).
-
-    float GetMass() const override;
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetAltitude
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -143,17 +132,6 @@ ClassInfoGetters
 	MOID DetectObstacle(float distance);
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  SetID
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Sets the MOID of this MovableObject for this frame.
-// Arguments:       A moid specifying the MOID that this MovableObject is
-//                  assigned for this frame.
-// Return value:    None.
-
-    void SetID(const MOID newID) override;
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          AutoStabilizing
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -165,30 +143,6 @@ ClassInfoGetters
 	bool AutoStabilizing() override { return true; }
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  GibThis
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gibs this, effectively destroying it and creating multiple gibs or
-//                  pieces in its place.
-// Arguments:       The impulse (kg * m/s) of the impact causing the gibbing to happen.
-//					The internal blast impulse which will push the gibs away from the center.
-//                  A pointer to an MO which the gibs shuold not be colliding with!
-// Return value:    None.
-
-	void GibThis(Vector impactImpulse = Vector(), float internalBlast = 10, MovableObject *pIgnoreMO = 0) override;
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  IsOnScenePoint
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Indicates whether this' current graphical representation overlaps
-//                  a point in absolute scene coordinates.
-// Arguments:       The point in absolute scene coordinates.
-// Return value:    Whether this' graphical rep overlaps the scene point.
-
-    bool IsOnScenePoint(Vector &scenePoint) const override;
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  UpdateAI
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -210,21 +164,6 @@ ClassInfoGetters
 	void Update() override;
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  Draw
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Draws this ACDropShip's current graphical representation to a
-//                  BITMAP of choice.
-// Arguments:       A pointer to a BITMAP to draw on.
-//                  The absolute position of the target bitmap's upper left corner in the Scene.
-//                  In which mode to draw in. See the DrawMode enumeration for the modes.
-//                  Whether to not draw any extra 'ghost' items of this MovableObject,
-//                  indicator arrows or hovering HUD text and so on.
-// Return value:    None.
-
-    void Draw(BITMAP *pTargetBitmap, const Vector &targetPos = Vector(), DrawMode mode = g_DrawColor, bool onlyPhysical = false) const override;
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:	GetMaxPassengers
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -237,64 +176,77 @@ ClassInfoGetters
 	int GetMaxPassengers() const override { return m_MaxPassengers > -1 ? m_MaxPassengers : 4; }
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetRThruster
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the right side engine.
-// Arguments:       None.
-// Return value:    An AEmitter pointer.
-
-    AEmitter * GetRThruster() const { return m_pRThruster; }
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetLThruster
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the left side engine.
-// Arguments:       None.
-// Return value:    An AEmitter pointer.
-
-    AEmitter * GetLThruster() const { return m_pLThruster; }
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetURThruster
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the right side secondary thruster.
-// Arguments:       None.
-// Return value:    An AEmitter pointer.
-
-    AEmitter * GetURThruster() const { return m_pURThruster; }
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetULThruster
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the left side secondary thruster.
-// Arguments:       None.
-// Return value:    An AEmitter pointer.
-
-    AEmitter * GetULThruster() const { return m_pULThruster; }
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetLHatch
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the left side hatch.
-// Arguments:       None.
-// Return value:    An Attachable pointer.
-
-	Attachable * GetLHatch() const { return m_pLHatch; }
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:	GetRHatch
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the right side hatch.
-// Arguments:       None.
-// Return value:    An Attachable pointer.
-
-	Attachable * GetRHatch() const { return m_pRHatch; }
+    /// <summary>
+    /// Gets the right side thruster of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the right side thruster of this ACDropship. Ownership is NOT transferred.</returns>
+    AEmitter * GetRightThruster() const { return m_pRThruster; }
+
+    /// <summary>
+    /// Sets the right side thruster for this ACDropship.
+    /// </summary>
+    /// <param name="newThruster">The new thruster to use.</param>
+    void SetRightThruster(AEmitter *newThruster);
+
+    /// <summary>
+    /// Gets the left side thruster of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the left side thruster of this ACDropship. Ownership is NOT transferred.</returns>
+    AEmitter * GetLeftThruster() const { return m_pLThruster; }
+
+    /// <summary>
+    /// Sets the left side thruster for this ACDropship.
+    /// </summary>
+    /// <param name="newThruster">The new thruster to use.</param>
+    void SetLeftThruster(AEmitter *newThruster);
+
+    /// <summary>
+    /// Gets the right side secondary thruster of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the right side secondary thruster of this ACDropship. Ownership is NOT transferred.</returns>
+    AEmitter * GetURightThruster() const { return m_pURThruster; }
+
+    /// <summary>
+    /// Sets the right side secondary thruster for this ACDropship.
+    /// </summary>
+    /// <param name="newThruster">The new thruster to use.</param>
+    void SetURightThruster(AEmitter *newThruster);
+
+    /// <summary>
+    /// Gets the left side secondary thruster of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the left side secondary thruster of this ACDropship. Ownership is NOT transferred.</returns>
+    AEmitter * GetULeftThruster() const { return m_pULThruster; }
+
+    /// <summary>
+    /// Sets the left side secondary thruster for this ACDropship.
+    /// </summary>
+    /// <param name="newThruster">The new thruster to use.</param>
+    void SetULeftThruster(AEmitter *newThruster);
+
+    /// <summary>
+    /// Gets the left side hatch of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the left side hatch of this ACDropship. Ownership is NOT transferred.</returns>
+    Attachable * GetLeftHatch() const { return m_pLHatch; }
+
+    /// <summary>
+    /// Sets the left side hatch for this ACDropship.
+    /// </summary>
+    /// <param name="newHatch">The new hatch to use.</param>
+    void SetLeftHatch(Attachable *newHatch);
+
+    /// <summary>
+    /// Gets the right side hatch of this ACDropship.
+    /// </summary>
+    /// <returns>A pointer to the right side hatch of this ACDropship. Ownership is NOT transferred.</returns>
+    Attachable * GetRightHatch() const { return m_pRHatch; }
+
+    /// <summary>
+    /// Sets the right side hatch for this ACDropship.
+    /// </summary>
+    /// <param name="newHatch">The new hatch to use.</param>
+    void SetRightHatch(Attachable *newHatch);
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -308,45 +260,6 @@ ClassInfoGetters
     void ResetEmissionTimers() override;
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  GetTotalWoundCount
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:		Returns total wound count of this actor and all vital attachables.
-// Arguments:       None.
-// Return value:    Returns total number of wounds of this actor.
-
-	int GetTotalWoundCount() const override; 
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  GetTotalWoundLimit
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:		Returns total wound limit of this actor and all vital attachables.
-// Arguments:       None.
-// Return value:    Returns total wound limit of this actor.
-
-	int GetTotalWoundLimit() const override; 
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          RemoveAnyRandomWounds
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Removes a specified amount of wounds from the actor and all standard attachables.
-// Arguments:       Amount of wounds to remove.
-// Return value:    Damage taken from removed wounds.
-
-	int RemoveAnyRandomWounds(int amount) override;
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  GetMOIDs
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Puts all MOIDs associated with this MO and all it's descendants into MOIDs vector
-// Arguments:       Vector to store MOIDs
-// Return value:    None.
-
-	void GetMOIDs(std::vector<MOID> &MOIDs) const override;
-
-
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  GetMaxEngineAngle
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -402,26 +315,13 @@ ClassInfoGetters
 
 protected:
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Virtual method:  UpdateChildMOIDs
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Makes this MO register itself and all its attached children in the
-//                  MOID register and get ID:s for itself and its children for this frame.
-// Arguments:       The MOID index to register itself and its children in.
-//                  The MOID of the root MO of this MO, ie the highest parent of this MO.
-//                  0 means that this MO is the root, ie it is owned by MovableMan.
-//                  Whether this MO should make a new MOID to use for itself, or to use
-//                  the same as the last one in the index (presumably its parent),
-// Return value:    None.
-
-    void UpdateChildMOIDs(std::vector<MovableObject *> &MOIDIndex, MOID rootMOID = g_NoMOID, bool makeNewMOID = true) override;
-
 
     // Member variables
     static Entity::ClassInfo m_sClass;
     // Body AtomGroups.
     AtomGroup *m_pBodyAG;
     // Thruster emitters.
+    //TODO when this class is cleaned up, these and their getters and setters should probably be renamed (I'd argue the lua bindings should be broken to match but that's debatable). L and R should be Left and Right and they should probably be Primary and Secondary.
     AEmitter *m_pRThruster;
     AEmitter *m_pLThruster;
     AEmitter *m_pURThruster;