1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-20 21:17:19 +02:00
parent 29354135dc
commit 9d0ec49e88
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Movement.cpp
+9 -9
View File
@@ -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;
Strategic/Strategic Movement.h
+3 -3
View File
@@ -52,10 +52,10 @@ typedef struct WAYPOINT
typedef struct PLAYERGROUP
{
UINT8 ubProfileID; //SAVE THIS VALUE ONLY. The others are temp (for quick access)
UINT16 ubID; //index in the Menptr array
UINT8 ubProfileID; //SAVE THIS VALUE ONLY. The others are temp (for quick access)
SoldierID ubID; //index in the Menptr array
SOLDIERTYPE *pSoldier; //direct access to the soldier pointer
UINT8 bFlags; //flags referring to individual player soldiers
UINT8 bFlags; //flags referring to individual player soldiers
struct PLAYERGROUP *next; //next player in list
}PLAYERGROUP;