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

Update SoldierID constructors

Browse Source
This commit is contained in:
Asdow
2024-11-18 23:38:43 +02:00
parent 94a5972a85
commit 191af4da49
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead Types.h
+19 -2
View File
@@ -386,14 +386,31 @@ typedef struct SoldierID
// Implicit conversion and constructor to provide compatibility with unchanged code // Implicit conversion and constructor to provide compatibility with unchanged code
// TODO: Remove once SoldierID is used everywhere and these are no longer needed // TODO: Remove once SoldierID is used everywhere and these are no longer needed
inline operator UINT16() const { return i; } inline operator UINT16() const { return i; }
SoldierID(const UINT16 val = 0)
: i(val) SoldierID(const UINT16 val = TOTAL_SOLDIERS) : i(val)
{
// Limit the maximum value to TOTAL_SOLDIERS. Anything beyond that is invalid
if ( i > TOTAL_SOLDIERS )
i = TOTAL_SOLDIERS;
}
SoldierID ( const UINT32 val ) : i ( val )
{
// Limit the maximum value to TOTAL_SOLDIERS. Anything beyond that is invalid
if ( i > TOTAL_SOLDIERS )
i = TOTAL_SOLDIERS;
}
SoldierID ( const INT32 val ) : i ( val )
{ {
// Limit the maximum value to TOTAL_SOLDIERS. Anything beyond that is invalid // Limit the maximum value to TOTAL_SOLDIERS. Anything beyond that is invalid
if ( i > TOTAL_SOLDIERS ) if ( i > TOTAL_SOLDIERS )
i = TOTAL_SOLDIERS; i = TOTAL_SOLDIERS;
} }
// No conversions from 8-bit integers!
SoldierID ( const UINT8 ) = delete;
SoldierID ( const INT8 ) = delete;
SOLDIERTYPE* operator->() { return MercPtrs[i]; } SOLDIERTYPE* operator->() { return MercPtrs[i]; }
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]; }