Provide access function to MenPtrs, MercPtrs & MercSlots

All raw array accesses should be done with these instead.
This commit is contained in:
Asdow
2024-11-13 01:33:32 +02:00
parent aad6ed8297
commit 4d740055da
2 changed files with 23 additions and 0 deletions
+20
View File
@@ -274,6 +274,26 @@ UINT32 guiNumMercSlots = 0;
SOLDIERTYPE* AwaySlots[ TOTAL_SOLDIERS ];
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
UINT8 gbPlayerNum = 0;
+3
View File
@@ -433,5 +433,8 @@ BOOLEAN IsCivFactionMemberAliveInSector( UINT8 usCivilianGroup );
BOOLEAN IsFreeSlotAvailable( int aTeam );
void AttemptToCapturePlayerSoldiers();
SOLDIERTYPE* SoldierFromID(const SoldierID id);
SOLDIERTYPE* SoldierFromID(const SoldierID id, SOLDIERTYPE* Array[TOTAL_SOLDIERS]);
#endif