1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct inc/dec operator overloads

Browse Source
This commit is contained in:
Asdow
2024-11-21 23:55:51 +02:00
parent d687956cf1
commit 1ac5d153fb
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead Types.h
+10 -11
View File
@@ -415,6 +415,16 @@ typedef struct SoldierID
const SOLDIERTYPE* operator->() const { return MercPtrs[i]; } const SOLDIERTYPE* operator->() const { return MercPtrs[i]; }
inline operator SOLDIERTYPE* () { return MercPtrs[i]; } inline operator SOLDIERTYPE* () { return MercPtrs[i]; }
inline operator const SOLDIERTYPE*() const { return MercPtrs[i]; } inline operator const SOLDIERTYPE*() const { return MercPtrs[i]; }
inline SoldierID &operator++()
{
i++;
return *this;
}
inline SoldierID &operator--()
{
i--;
return *this;
}
} SoldierID; } SoldierID;
inline bool operator==(const SoldierID lhs, const SoldierID rhs) { return lhs.i == rhs.i; } inline bool operator==(const SoldierID lhs, const SoldierID rhs) { return lhs.i == rhs.i; }
@@ -475,17 +485,6 @@ inline SoldierID operator+(const SoldierID lhs, const UINT16 rhs) { return Soldi
inline SoldierID operator+(const unsigned int lhs, const SoldierID rhs) { return SoldierID{ static_cast<UINT16>(lhs + rhs.i) }; } inline SoldierID operator+(const unsigned int lhs, const SoldierID rhs) { return SoldierID{ static_cast<UINT16>(lhs + rhs.i) }; }
inline SoldierID operator+(const INT16 lhs, const SoldierID rhs) { return SoldierID{ static_cast<UINT16>(lhs + rhs.i) }; } inline SoldierID operator+(const INT16 lhs, const SoldierID rhs) { return SoldierID{ static_cast<UINT16>(lhs + rhs.i) }; }
inline SoldierID operator--(SoldierID lhs)
{
lhs.i -= 1;
return lhs;
}
inline SoldierID operator++(SoldierID lhs)
{
lhs.i += 1;
return lhs;
}
//TODO: Change this to constexpr after SoldierID is ready and the user defined constructor from uint16 is not needed anymore. //TODO: Change this to constexpr after SoldierID is ready and the user defined constructor from uint16 is not needed anymore.
inline constexpr SoldierID NOBODY{ TOTAL_SOLDIERS }; inline constexpr SoldierID NOBODY{ TOTAL_SOLDIERS };