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

Update merccompare.cpp

Browse Source
This commit is contained in:
Asdow
2024-11-18 23:12:17 +02:00
parent 9fb29cf444
commit e9e8080077
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/merccompare.cpp
+8 -8
View File
@@ -433,12 +433,12 @@ void RenderMercCompareAnalyze()
BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB )
{
VOBJECT_DESC VObjectDesc;
HVOBJECT hPixHandle;
VOBJECT_DESC VObjectDesc;
HVOBJECT hPixHandle;
UINT16 usPosX, usPosY, usPosY2;
UINT32 uiInsMercFaceImage;
INT32 iCostOfContract = 0;
char sTemp[100];
char sTemp[100];
CHAR16 sText[800];
BOOLEAN fDisplayMercContractStateTextColorInRed = FALSE;
@@ -452,14 +452,14 @@ BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB )
if ( !pProfileA || !pProfileB )
return FALSE;
INT16 idA = GetSoldierIDFromMercID( usProfileA );
INT16 idB = GetSoldierIDFromMercID( usProfileB );
SoldierID idA = GetSoldierIDFromMercID( usProfileA );
SoldierID idB = GetSoldierIDFromMercID( usProfileB );
if ( idA < 0 || idB < 0 )
if ( idA == NOBODY || idB == NOBODY )
return FALSE;
SOLDIERTYPE* pSoldierA = MercPtrs[idA];
SOLDIERTYPE* pSoldierB = MercPtrs[idB];
SOLDIERTYPE* pSoldierA = idA;
SOLDIERTYPE* pSoldierB = idB;
if ( !pSoldierA || !pSoldierB )
return FALSE;