mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Use SoldierID
This commit is contained in:
@@ -4310,12 +4310,12 @@ BOOLEAN LoadPlayerGroupList( HWFILE hFile, GROUP **pGroup )
|
||||
{
|
||||
PLAYERGROUP *pTemp=NULL;
|
||||
PLAYERGROUP *pHead=NULL;
|
||||
UINT32 uiNumberOfNodes=0;
|
||||
UINT32 uiProfileID=0;
|
||||
UINT32 uiNumBytesRead;
|
||||
UINT32 cnt=0;
|
||||
INT16 sTempID;
|
||||
GROUP *pTempGroup = *pGroup;
|
||||
UINT32 uiNumberOfNodes=0;
|
||||
UINT32 uiProfileID=0;
|
||||
UINT32 uiNumBytesRead;
|
||||
UINT32 cnt=0;
|
||||
SoldierID sTempID;
|
||||
GROUP *pTempGroup = *pGroup;
|
||||
|
||||
// pTemp = pGroup;
|
||||
|
||||
@@ -4350,10 +4350,10 @@ BOOLEAN LoadPlayerGroupList( HWFILE hFile, GROUP **pGroup )
|
||||
sTempID = GetSoldierIDFromMercID( pTemp->ubProfileID );
|
||||
|
||||
//Should never happen
|
||||
Assert( sTempID != -1 );
|
||||
pTemp->ubID = (UINT16) sTempID;
|
||||
Assert( sTempID != NOBODY );
|
||||
pTemp->ubID = sTempID;
|
||||
|
||||
pTemp->pSoldier = &Menptr[ pTemp->ubID ];
|
||||
pTemp->pSoldier = pTemp->ubID;
|
||||
|
||||
pTemp->next = NULL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user