From 8c6ac4cd162a13381cfe7ec792871c0db5e27ce8 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Thu, 3 Sep 2020 22:03:31 +0000
Subject: [PATCH] Fix dynamic casts to avoid gcc-11 diagnostics

---
 src/graphics/engine/camera.cpp              |  8 ++++----
 src/object/interface/carrier_object.h       |  2 +-
 src/object/interface/powered_object.h       | 10 +++++-----
 src/object/interface/transportable_object.h |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp
index c55473ab..f3b96186 100644
--- a/src/graphics/engine/camera.cpp
+++ b/src/graphics/engine/camera.cpp
@@ -59,14 +59,14 @@ static void SetTransparency(CObject* obj, float value)
 
     if (obj->Implements(ObjectInterfaceType::Carrier))
     {
-        CObject* cargo = dynamic_cast<CCarrierObject*>(obj)->GetCargo();
+        CObject* cargo = dynamic_cast<CCarrierObject&>(*obj).GetCargo();
         if (cargo != nullptr)
             cargo->SetTransparency(value);
     }
 
     if (obj->Implements(ObjectInterfaceType::Powered))
     {
-        CObject* power = dynamic_cast<CPoweredObject*>(obj)->GetPower();
+        CObject* power = dynamic_cast<CPoweredObject&>(*obj).GetPower();
         if (power != nullptr)
             power->SetTransparency(value);
     }
@@ -1233,7 +1233,7 @@ bool CCamera::EventFrameBack(const Event &event)
 
         bool ground = true;
         if (m_cameraObj->Implements(ObjectInterfaceType::Movable))
-            ground = dynamic_cast<CMovableObject*>(m_cameraObj)->GetPhysics()->GetLand();
+            ground = dynamic_cast<CMovableObject&>(*m_cameraObj).GetPhysics()->GetLand();
         if ( ground )  // ground?
         {
             Math::Vector pos = lookatPt + (lookatPt - m_eyePt);
@@ -1326,7 +1326,7 @@ bool CCamera::EventFrameOnBoard(const Event &event)
     {
         assert(m_cameraObj->Implements(ObjectInterfaceType::Controllable));
         Math::Vector lookatPt, upVec;
-        dynamic_cast<CControllableObject*>(m_cameraObj)->AdjustCamera(m_eyePt, m_directionH, m_directionV, lookatPt, upVec, m_type);
+        dynamic_cast<CControllableObject&>(*m_cameraObj).AdjustCamera(m_eyePt, m_directionH, m_directionV, lookatPt, upVec, m_type);
         Math::Vector eye    = m_effectOffset * 0.3f + m_eyePt;
         Math::Vector lookat = m_effectOffset * 0.3f + lookatPt;
 
diff --git a/src/object/interface/carrier_object.h b/src/object/interface/carrier_object.h
index 857ff0bf..2cbf3d73 100644
--- a/src/object/interface/carrier_object.h
+++ b/src/object/interface/carrier_object.h
@@ -51,5 +51,5 @@ public:
 inline bool IsObjectCarryingCargo(CObject* obj)
 {
     return obj->Implements(ObjectInterfaceType::Carrier) &&
-           dynamic_cast<CCarrierObject*>(obj)->IsCarryingCargo();
+           dynamic_cast<CCarrierObject&>(*obj).IsCarryingCargo();
 }
diff --git a/src/object/interface/powered_object.h b/src/object/interface/powered_object.h
index b1652e47..3aea3296 100644
--- a/src/object/interface/powered_object.h
+++ b/src/object/interface/powered_object.h
@@ -61,10 +61,10 @@ inline float GetObjectEnergy(CObject* object)
 
     if (object->Implements(ObjectInterfaceType::Powered))
     {
-        CObject* power = dynamic_cast<CPoweredObject*>(object)->GetPower();
+        CObject* power = dynamic_cast<CPoweredObject&>(*object).GetPower();
         if (power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer))
         {
-            energy = dynamic_cast<CPowerContainerObject*>(power)->GetEnergy();
+            energy = dynamic_cast<CPowerContainerObject&>(*power).GetEnergy();
         }
     }
 
@@ -77,10 +77,10 @@ inline float GetObjectEnergyLevel(CObject* object)
 
     if (object->Implements(ObjectInterfaceType::Powered))
     {
-        CObject* power = dynamic_cast<CPoweredObject*>(object)->GetPower();
+        CObject* power = dynamic_cast<CPoweredObject&>(*object).GetPower();
         if (power != nullptr && power->Implements(ObjectInterfaceType::PowerContainer))
         {
-            energy = dynamic_cast<CPowerContainerObject*>(power)->GetEnergyLevel();
+            energy = dynamic_cast<CPowerContainerObject&>(*power).GetEnergyLevel();
         }
     }
 
@@ -90,5 +90,5 @@ inline float GetObjectEnergyLevel(CObject* object)
 inline bool ObjectHasPowerCell(CObject* object)
 {
     return object->Implements(ObjectInterfaceType::Powered) &&
-           dynamic_cast<CPoweredObject*>(object)->GetPower() != nullptr;
+           dynamic_cast<CPoweredObject&>(*object).GetPower() != nullptr;
 }
diff --git a/src/object/interface/transportable_object.h b/src/object/interface/transportable_object.h
index a45d9e0c..38e88dc5 100644
--- a/src/object/interface/transportable_object.h
+++ b/src/object/interface/transportable_object.h
@@ -54,5 +54,5 @@ public:
 inline bool IsObjectBeingTransported(CObject* obj)
 {
     return obj->Implements(ObjectInterfaceType::Transportable) &&
-           dynamic_cast<CTransportableObject*>(obj)->IsBeingTransported();
+           dynamic_cast<CTransportableObject&>(*obj).IsBeingTransported();
 }