1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert SOLDIERTYPE::ubRobotRemoteHolderID to SoldierID

Browse Source
This commit is contained in:
Asdow
2024-11-15 23:56:26 +02:00
parent 566ead5815
commit 75deccbc44
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Auto Resolve.cpp
+1 -1
View File
@@ -2835,7 +2835,7 @@ void RetreatButtonCallback( GUI_BUTTON *btn, INT32 reason )
if( gpAR->pRobotCell ) if( gpAR->pRobotCell )
{ {
//if robot is retreating, set the retreat time to be the same as the robot's controller. //if robot is retreating, set the retreat time to be the same as the robot's controller.
UINT16 ubRobotControllerID; SoldierID ubRobotControllerID;
ubRobotControllerID = gpAR->pRobotCell->pSoldier->ubRobotRemoteHolderID; ubRobotControllerID = gpAR->pRobotCell->pSoldier->ubRobotRemoteHolderID;
Tactical/Dialogue Control.cpp
+1 -1
View File
@@ -1595,7 +1595,7 @@ BOOLEAN TacticalCharacterDialogue( SOLDIERTYPE *pSoldier, UINT16 usQuoteNum )
{ {
if ( pSoldier->CanRobotBeControlled( ) ) if ( pSoldier->CanRobotBeControlled( ) )
{ {
return( TacticalCharacterDialogue( MercPtrs[ pSoldier->ubRobotRemoteHolderID ], usQuoteNum ) ); return( TacticalCharacterDialogue( pSoldier->ubRobotRemoteHolderID, usQuoteNum ) );
} }
else else
{ {
Tactical/Soldier Control.cpp
+2 -4
View File
@@ -23549,8 +23549,6 @@ BOOLEAN SOLDIERTYPE::IsValidPistolFastShot( INT16 bAimTime, INT32 iTrgGridNo )
} }
BOOLEAN SOLDIERTYPE::CanRobotBeControlled( void ) BOOLEAN SOLDIERTYPE::CanRobotBeControlled( void )
{ {
SOLDIERTYPE *pController;
if ( !(this->flags.uiStatusFlags & SOLDIER_ROBOT) ) if ( !(this->flags.uiStatusFlags & SOLDIER_ROBOT) )
{ {
return(FALSE); return(FALSE);
@@ -23561,7 +23559,7 @@ BOOLEAN SOLDIERTYPE::CanRobotBeControlled( void )
return(FALSE); return(FALSE);
} }
pController = MercPtrs[this->ubRobotRemoteHolderID]; SOLDIERTYPE* pController = this->ubRobotRemoteHolderID;
if ( pController->bActive ) if ( pController->bActive )
{ {
@@ -23665,7 +23663,7 @@ SOLDIERTYPE *SOLDIERTYPE::GetRobotController( void )
} }
else else
{ {
return(MercPtrs[this->ubRobotRemoteHolderID]); return(this->ubRobotRemoteHolderID);
} }
} }
Tactical/Soldier Control.h
+1 -1
View File
@@ -1428,7 +1428,7 @@ public:
INT32 iBurstSoundID; INT32 iBurstSoundID;
INT8 bSlotItemTakenFrom; INT8 bSlotItemTakenFrom;
UINT16 ubAutoBandagingMedic; UINT16 ubAutoBandagingMedic;
UINT16 ubRobotRemoteHolderID; SoldierID ubRobotRemoteHolderID;
UINT32 uiTimeOfLastContractUpdate; UINT32 uiTimeOfLastContractUpdate;
INT8 bTypeOfLastContract; INT8 bTypeOfLastContract;
INT8 bTurnsCollapsed; INT8 bTurnsCollapsed;
Tactical/TeamTurns.cpp
+2 -2
View File
@@ -1825,8 +1825,8 @@ INT8 CalcInterruptDuelPts( SOLDIERTYPE * pSoldier, UINT16 ubOpponentID, BOOLEAN
{ {
//iPoints = EffectiveExpLevel( MercPtrs[ pSoldier->ubRobotRemoteHolderID ] ) - 2; //iPoints = EffectiveExpLevel( MercPtrs[ pSoldier->ubRobotRemoteHolderID ] ) - 2;
// Snap: (do some proper rounding here) // Snap: (do some proper rounding here)
iPoints = ( 20*EffectiveExpLevel( MercPtrs[ pSoldier->ubRobotRemoteHolderID ] ) iPoints = ( 20*EffectiveExpLevel( pSoldier->ubRobotRemoteHolderID )
+ EffectiveAgility( MercPtrs[ pSoldier->ubRobotRemoteHolderID ], FALSE ) + 15 ) / 30 - 2; + EffectiveAgility( pSoldier->ubRobotRemoteHolderID, FALSE ) + 15 ) / 30 - 2;
} }
else else
{ {