Apply review remark: don't const_cast inside GamePlayer::GetHQ

Return-To-The-Roots · Aug 5, 2024 · 0353ac7 · 0353ac7
1 parent 2b45ff6
commit 0353ac7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libs/s25main/GamePlayer.cpp b/libs/s25main/GamePlayer.cpp
@@ -386,7 +386,7 @@ bool GamePlayer::IsHQTent() const
 
 void GamePlayer::SetHQIsTent(bool isTent)
 {
-    if(nobHQ* hq = GetHQ())
+    if(nobHQ* hq = const_cast<nobHQ*>(GetHQ()))
         hq->SetIsTent(isTent);
 }
 
@@ -1379,10 +1379,10 @@ void GamePlayer::TestDefeat()
         Surrender();
 }
 
-nobHQ* GamePlayer::GetHQ() const
+const nobHQ* GamePlayer::GetHQ() const
 {
     const MapPoint& hqPos = GetHQPos();
-    return const_cast<nobHQ*>(hqPos.isValid() ? GetGameWorld().GetSpecObj<nobHQ>(hqPos) : nullptr);
+    return hqPos.isValid() ? GetGameWorld().GetSpecObj<nobHQ>(hqPos) : nullptr;
 }
 
 void GamePlayer::Surrender()

diff --git a/libs/s25main/GamePlayer.h b/libs/s25main/GamePlayer.h
@@ -430,7 +430,7 @@ class GamePlayer : public GamePlayerInfo
     bool FindWarehouseForJob(Job job, noRoadNode* goal) const;
     /// Prüft, ob der Spieler besiegt wurde
     void TestDefeat();
-    nobHQ* GetHQ() const;
+    const nobHQ* GetHQ() const;
 
     //////////////////////////////////////////////////////////////////////////
     /// Unsynchronized state (e.g. lua, gui...)