mirror of
https://github.com/1dot13/source.git
synced 2026-08-26 14:30:26 +02:00
Provide access function to MenPtrs, MercPtrs & MercSlots
All raw array accesses should be done with these instead.
This commit is contained in:
@@ -274,6 +274,26 @@ UINT32 guiNumMercSlots = 0;
|
|||||||
SOLDIERTYPE* AwaySlots[ TOTAL_SOLDIERS ];
|
SOLDIERTYPE* AwaySlots[ TOTAL_SOLDIERS ];
|
||||||
UINT32 guiNumAwaySlots = 0;
|
UINT32 guiNumAwaySlots = 0;
|
||||||
|
|
||||||
|
SOLDIERTYPE* SoldierFromID(const SoldierID id)
|
||||||
|
{
|
||||||
|
if (id >= TOTAL_SOLDIERS)
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return &Menptr[id.i];
|
||||||
|
}
|
||||||
|
|
||||||
|
SOLDIERTYPE* SoldierFromID(const SoldierID id, SOLDIERTYPE* Array[TOTAL_SOLDIERS])
|
||||||
|
{
|
||||||
|
if (id >= TOTAL_SOLDIERS)
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Array[id.i];
|
||||||
|
}
|
||||||
|
|
||||||
// DEF: changed to have client wait for gPlayerNum assigned from host
|
// DEF: changed to have client wait for gPlayerNum assigned from host
|
||||||
UINT8 gbPlayerNum = 0;
|
UINT8 gbPlayerNum = 0;
|
||||||
|
|
||||||
|
|||||||
@@ -433,5 +433,8 @@ BOOLEAN IsCivFactionMemberAliveInSector( UINT8 usCivilianGroup );
|
|||||||
|
|
||||||
BOOLEAN IsFreeSlotAvailable( int aTeam );
|
BOOLEAN IsFreeSlotAvailable( int aTeam );
|
||||||
void AttemptToCapturePlayerSoldiers();
|
void AttemptToCapturePlayerSoldiers();
|
||||||
|
|
||||||
|
SOLDIERTYPE* SoldierFromID(const SoldierID id);
|
||||||
|
SOLDIERTYPE* SoldierFromID(const SoldierID id, SOLDIERTYPE* Array[TOTAL_SOLDIERS]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user