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

Merged New Inventory Project into main branch

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/strategic.cpp
+15 -15
View File
@@ -29,12 +29,12 @@ BOOLEAN HandleStrategicDeath( SOLDIERTYPE *pSoldier )
// add the guy to the dead list
//AddCharacterToDeadList( pSoldier );
// If in a vehicle, remove them!
// If in a vehicle, remove them!
if( ( pSoldier->bAssignment == VEHICLE ) && ( pSoldier->iVehicleId != -1 ) )
{
// remove from vehicle
TakeSoldierOutOfVehicle( pSoldier );
}
}
// if not in mapscreen
if ( !(guiTacticalInterfaceFlags & INTERFACE_MAPSCREEN ) )
@@ -47,10 +47,10 @@ BOOLEAN HandleStrategicDeath( SOLDIERTYPE *pSoldier )
ChangeSoldiersAssignment( pSoldier, ASSIGNMENT_DEAD );
}
else if( ( pSoldier -> bLife == 0 )&&( pSoldier->bAssignment != ASSIGNMENT_DEAD ) )
else if( ( pSoldier->stats.bLife == 0 )&&( pSoldier->bAssignment != ASSIGNMENT_DEAD ) )
{
// died in mapscreen
fReDrawFace = TRUE;
// dead
@@ -62,22 +62,22 @@ BOOLEAN HandleStrategicDeath( SOLDIERTYPE *pSoldier )
ChangeSoldiersAssignment( pSoldier, ASSIGNMENT_DEAD );
//s et breath and breath max to 0
pSoldier -> bBreath = pSoldier->bBreathMax = 0;
pSoldier->bBreath = pSoldier->bBreathMax = 0;
// rebuild list
ReBuildCharactersList( );
// ste merc as dead
// pSoldier->fUIdeadMerc = TRUE;
// attempt o remove character from squad
// pSoldier->flags.fUIdeadMerc = TRUE;
// attempt to remove character from squad
RemoveCharacterFromSquads( pSoldier );
// handle any passign comments by grunts
HandleSoldierDeadComments( pSoldier );
// put the dead guys down
AddDeadSoldierToUnLoadedSector( ( UINT8 ) ( pSoldier->sSectorX ), ( UINT8 )( pSoldier->sSectorY ), pSoldier->bSectorZ, pSoldier, RandomGridNo(), ADD_DEAD_SOLDIER_TO_SWEETSPOT );
AddDeadSoldierToUnLoadedSector( ( UINT8 ) ( pSoldier->sSectorX ), ( UINT8 )( pSoldier->sSectorY ), pSoldier->bSectorZ, pSoldier, RandomGridNo(), ADD_DEAD_SOLDIER_TO_SWEETSPOT );
fTeamPanelDirty = TRUE;
fMapPanelDirty = TRUE;
@@ -99,11 +99,11 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier )
// IF IT'S THE SELECTED GUY, MAKE ANOTHER SELECTED!
cnt = gTacticalStatus.Team[ pSoldier->bTeam ].bFirstID;
// see if this was the friend of a living merc
for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ pSoldier->bTeam ].bLastID; cnt++,pTeamSoldier++)
{
if ( pTeamSoldier->bLife >= OKLIFE && pTeamSoldier->bActive )
{
if ( pTeamSoldier->stats.bLife >= OKLIFE && pTeamSoldier->bActive )
{
bBuddyIndex = WhichBuddy( pTeamSoldier->ubProfile, pSoldier->ubProfile );
switch( bBuddyIndex )
@@ -128,4 +128,4 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier )
return;
}
}