Refactor client CLuaBlipDefs to use new parser (PR #3536)

multitheftauto · Jan 10, 2025 · d05d09b · d05d09b
1 parent c278c12
commit d05d09b
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 362 deletions.
diff --git a/Client/mods/deathmatch/logic/CClientRadarMarker.h b/Client/mods/deathmatch/logic/CClientRadarMarker.h
@@ -39,13 +39,13 @@ class CClientRadarMarker final : public CClientEntity
     void SetPosition(const CVector& vecPosition);
     void GetPosition(CVector& vecPosition) const;
 
-    unsigned short GetScale() { return m_usScale; };
+    unsigned short GetScale() const noexcept { return m_usScale; }
     void           SetScale(unsigned short usScale);
 
-    SColor GetColor() const { return m_Color; }
+    SColor GetColor() const noexcept { return m_Color; }
     void   SetColor(const SColor color);
 
-    unsigned long GetSprite() const { return m_ulSprite; };
+    unsigned long GetSprite() const noexcept { return m_ulSprite; }
     void          SetSprite(unsigned long ulSprite);
 
     bool IsVisible() const { return m_bIsVisible; };
@@ -54,10 +54,10 @@ class CClientRadarMarker final : public CClientEntity
     void SetDimension(unsigned short usDimension) override;
     void RelateDimension(unsigned short usDimension);
 
-    short GetOrdering() { return m_sOrdering; }
+    short GetOrdering() const noexcept { return m_sOrdering; }
     void  SetOrdering(short sOrdering);
 
-    unsigned short GetVisibleDistance() { return m_usVisibleDistance; }
+    unsigned short GetVisibleDistance() const noexcept { return m_usVisibleDistance; }
     void           SetVisibleDistance(unsigned short usVisibleDistance) { m_usVisibleDistance = usVisibleDistance; }
 
     bool IsInVisibleDistance();

diff --git a/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h b/Client/mods/deathmatch/logic/CClientRadarMarkerManager.h
@@ -36,7 +36,7 @@ class CClientRadarMarkerManager
     std::list<CClientRadarMarker*>::const_iterator IterEnd() { return m_Markers.end(); };
 
     bool        Exists(CClientRadarMarker* pMarker);
-    static bool IsValidIcon(unsigned long ulIcon) { return ulIcon <= RADAR_MARKER_LIMIT; }
+    static bool IsValidIcon(unsigned long ulIcon) noexcept { return ulIcon <= RADAR_MARKER_LIMIT; }
 
 private:
     void AddToList(CClientRadarMarker* pMarker) { m_Markers.push_back(pMarker); };