Skip to content

Commit fa8efbf

Browse files
committed
Properly use uint32_t instead of uint16_t
- Had possible value ranges mixed
1 parent 35e0967 commit fa8efbf

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

public/ics2fixes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ class ICS2Fixes
4747
// Sets a player's immunity level. This will be overwritten if the plugin is reloaded
4848
// or an admin uses c_reload_admins as it does not alter the config file.
4949
// Returns false if unable to modify the admin (internal admin system is not set up yet)
50-
virtual bool SetAdminImmunity(std::uint64_t iSteam64ID, std::uint16_t iImmunity) = 0;
50+
virtual bool SetAdminImmunity(std::uint64_t iSteam64ID, std::uint32_t iImmunity) = 0;
5151
};

src/adminsystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,7 +1245,7 @@ void CAdmin::SetFlags(uint64 iFlags)
12451245
zpAdmin->SetAdminFlags(iFlags);
12461246
}
12471247

1248-
void CAdmin::SetImmunity(std::uint16_t iAdminImmunity)
1248+
void CAdmin::SetImmunity(std::uint32_t iAdminImmunity)
12491249
{
12501250
if (iAdminImmunity > INT_MAX)
12511251
iAdminImmunity = INT_MAX;
@@ -1258,7 +1258,7 @@ void CAdmin::SetImmunity(std::uint16_t iAdminImmunity)
12581258
if (!zpAdmin) // Authentication is checked in GetPlayerFromSteamId, so dont need to redo it here
12591259
return;
12601260

1261-
zpAdmin->SetAdminImmunity(static_cast<int>(iAdminImmunity)); // should be safe to cast, as range for std::uint16_t is [0, INT_MAX]
1261+
zpAdmin->SetAdminImmunity(static_cast<int>(iAdminImmunity)); // should be safe to cast, as range for std::uint32_t is [0, INT_MAX]
12621262
}
12631263

12641264
CAdminSystem::CAdminSystem()

src/adminsystem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class CAdminBase
148148

149149
void SetFlags(uint64 iFlags) { m_iFlags = iFlags; };
150150
uint64 GetFlags() const { return m_iFlags; }
151-
void SetImmunity(std::uint16_t iAdminImmunity) {m_iAdminImmunity = static_cast<int>(iAdminImmunity); }
151+
void SetImmunity(std::uint32_t iAdminImmunity) {m_iAdminImmunity = static_cast<int>(iAdminImmunity); }
152152
int GetImmunity() const { return m_iAdminImmunity; }
153153

154154
private:
@@ -165,7 +165,7 @@ class CAdmin : public CAdminBase
165165

166166
std::string GetName() { return m_strName; }
167167
void SetFlags(uint64 iFlags);
168-
void SetImmunity(std::uint16_t iAdminImmunity);
168+
void SetImmunity(std::uint32_t iAdminImmunity);
169169

170170
private:
171171
std::string m_strName;

src/cs2fixes.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,7 @@ int CS2Fixes::GetAdminImmunity(std::uint64_t iSteam64ID) const
12751275
return admin->GetImmunity();
12761276
}
12771277

1278-
bool CS2Fixes::SetAdminImmunity(std::uint64_t iSteam64ID, std::uint16_t iImmunity)
1278+
bool CS2Fixes::SetAdminImmunity(std::uint64_t iSteam64ID, std::uint32_t iImmunity)
12791279
{
12801280
if (!g_pAdminSystem)
12811281
return false;

src/cs2fixes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CS2Fixes : public ISmmPlugin, public IMetamodListener, public ICS2Fixes
9292
std::uint64_t GetAdminFlags(std::uint64_t iSteam64ID) const override;
9393
bool SetAdminFlags(std::uint64_t iSteam64ID, std::uint64_t iFlags) override;
9494
int GetAdminImmunity(std::uint64_t iSteam64ID) const override;
95-
bool SetAdminImmunity(std::uint64_t iSteam64ID, std::uint16_t iImmunity) override;
95+
bool SetAdminImmunity(std::uint64_t iSteam64ID, std::uint32_t iImmunity) override;
9696

9797
public:
9898
const char* GetAuthor();

0 commit comments

Comments
 (0)