Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor client CLuaBlipDefs to use new parser #3536

Merged
merged 16 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Client/mods/deathmatch/logic/CClientRadarMarker.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CClientRadarMarkerManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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); };
Expand Down
Loading
Loading