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

Use SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-30 15:20:18 +02:00
parent d960403514
commit 24656f2810
12 changed files with 113 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+11 -11
View File
@@ -7233,12 +7233,12 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
if ( gpCurrentTalkingFace != NULL )
return;
UINT16 ubSourceMerc = gusSelectedSoldier;
UINT16 ubTargetMerc;
SoldierID ubSourceMerc = gusSelectedSoldier;
SoldierID ubTargetMerc;
INT32 iSourceFace;
INT32 iTargetFace;
UINT8 ubGroupID = pSoldier->ubGroupID;
INT8 bOldPosition = GetTeamSlotFromPlayerID ( MercPtrs[ ubSourceMerc ]->ubID );
INT8 bOldPosition = GetTeamSlotFromPlayerID ( ubSourceMerc );
INT8 bNewPosition = bOldPosition + bDirection;
SOLDIERTYPE TempMenptr = Menptr[ ubSourceMerc ];
@@ -7266,15 +7266,15 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
ubTargetMerc = gTeamPanel[ bNewPosition ].ubID;
// Hey, you're dead. I don't want to swap with you.
if ( MercPtrs[ubTargetMerc]->stats.bLife <= 0 )
if ( ubTargetMerc->stats.bLife <= 0 )
{
RebuildCurrentSquad( );
return;
}
// store face indexes
iSourceFace = MercPtrs[ ubSourceMerc ]->iFaceIndex;
iTargetFace = MercPtrs[ ubTargetMerc ]->iFaceIndex;
iSourceFace = ubSourceMerc->iFaceIndex;
iTargetFace = ubTargetMerc->iFaceIndex;
FACETYPE TempFace = gFacesData[ iSourceFace ];
// swap the data
@@ -7299,11 +7299,11 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection )
Menptr[ ubTargetMerc ].iFaceIndex = iTargetFace;
// update group info
RemovePlayerFromGroup( ubGroupID, MercPtrs[ ubSourceMerc ] );
RemovePlayerFromGroup( ubGroupID, MercPtrs[ ubTargetMerc ] );
AddPlayerToGroup( ubGroupID, MercPtrs[ ubSourceMerc ] );
AddPlayerToGroup( ubGroupID, MercPtrs[ ubTargetMerc ] );
SortSquadByID( MercPtrs[ ubSourceMerc ]->bAssignment );
RemovePlayerFromGroup( ubGroupID, ubSourceMerc );
RemovePlayerFromGroup( ubGroupID, ubTargetMerc );
AddPlayerToGroup( ubGroupID, ubSourceMerc );
AddPlayerToGroup( ubGroupID, ubTargetMerc );
SortSquadByID( ubSourceMerc->bAssignment );
RebuildCurrentSquad( );
// don't forget to renew selection of merc