Remove AHuman::GetGraphicalIcon and replace it with an override to MOSprite::GetGraphicalIcon as well as adding the same logic to ACrab, but with Turret

Author: fourZK

Entities/ACrab.cpp

@@ -575,6 +575,9 @@ void ACrab::SetRightBGLeg(Leg *newLeg) {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+BITMAP *ACrab::GetGraphicalIcon() const {
+	return m_pTurret ? m_pTurret->GetSpriteFrame(0) : MOSprite::GetGraphicalIcon();
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  CollideAtPoint

Entities/ACrab.h

@@ -435,6 +435,13 @@ int FirearmActivationDelay() const;
 	MovableObject * LookForMOs(float FOVSpread = 45, unsigned char ignoreMaterial = 0, bool ignoreAllTerrain = false);
 
 
+	/// <summary>
+	/// Gets the BITMAP representation of this ACrab's Turret, or its body if no Turret has been defined.
+	/// </summary>
+	/// <returns>The Turret or body of this ACrab as a BITMAP.</returns>
+	BITMAP *GetGraphicalIcon() const override;
+
+
 //////////////////////////////////////////////////////////////////////////////////////////
 // Virtual method:  UpdateMovePath
 //////////////////////////////////////////////////////////////////////////////////////////

Entities/AHuman.cpp

@@ -630,8 +630,8 @@ void AHuman::SetBGLeg(Leg *newLeg) {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-BITMAP *AHuman::GetHeadBitmap() const {
-    return (m_pHead && m_pHead->IsAttached()) ? m_pHead->GetSpriteFrame(0) : nullptr;
+BITMAP *AHuman::GetGraphicalIcon() const {
+	return m_pHead ? m_pHead->GetSpriteFrame(0) : MOSprite::GetGraphicalIcon();
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Entities/AHuman.h

@@ -321,16 +321,6 @@ ClassInfoGetters;
     void SetBGFoot(Attachable *newFoot) { if (m_pBGLeg && m_pBGLeg->IsAttached()) { m_pBGLeg->SetFoot(newFoot); } }
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          GetHeadBitmap
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets the sprite representing the head of this.
-// Arguments:       None.
-// Return value:    A pointer to the bitmap of with the head of this. Ownership is NOT
-//                  transferred!
-
-    BITMAP *GetHeadBitmap() const;
-
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // Method:          GetJetTimeTotal
@@ -742,16 +732,11 @@ ClassInfoGetters;
 	MovableObject * LookForMOs(float FOVSpread = 45, unsigned char ignoreMaterial = 0, bool ignoreAllTerrain = false);
 
 
-//////////////////////////////////////////////////////////////////////////////////////////
-// Method:          GetGraphicalIcon
-//////////////////////////////////////////////////////////////////////////////////////////
-// Description:     Gets a bitmap showing a good identifyable icon of this, for use in
-//                  GUI lists etc.
-// Arguments:       None.
-// Return value:    A good identifyable graphical representation of this in a BITMAP, if
-//                  available. If not, 0 is returned. Ownership is NOT TRANSFERRED!
-
-    BITMAP * GetGraphicalIcon() const override { return GetHeadBitmap(); }
+	/// <summary>
+	/// Gets the BITMAP representation of this AHuman's Head, or its body if no Head has been defined.
+	/// </summary>
+	/// <returns>The Head or body of this AHuman as a BITMAP.</returns>
+	BITMAP *GetGraphicalIcon() const override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////