mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
wrapped the SOLDIERTYPE member variable name in GetName(). This will allow easier manipulation with pre/suffixes, ranks, titles etc.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
+47
-44
@@ -1906,7 +1906,7 @@ BOOLEAN CanCharacterSleep( SOLDIERTYPE *pSoldier, BOOLEAN fExplainWhyNot )
|
||||
if( fExplainWhyNot )
|
||||
{
|
||||
// on the move, can't sleep
|
||||
swprintf( sString, zMarksMapScreenText[ 5 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 5 ], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
|
||||
@@ -1921,7 +1921,7 @@ BOOLEAN CanCharacterSleep( SOLDIERTYPE *pSoldier, BOOLEAN fExplainWhyNot )
|
||||
if( fExplainWhyNot )
|
||||
{
|
||||
// is driving, can't sleep
|
||||
swprintf( sString, zMarksMapScreenText[ 7 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 7 ], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
|
||||
@@ -1966,7 +1966,7 @@ BOOLEAN CanCharacterSleep( SOLDIERTYPE *pSoldier, BOOLEAN fExplainWhyNot )
|
||||
{
|
||||
if( fExplainWhyNot )
|
||||
{
|
||||
swprintf( sString, zMarksMapScreenText[ 4 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 4 ], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
|
||||
@@ -1997,7 +1997,7 @@ BOOLEAN CanCharacterBeAwakened( SOLDIERTYPE *pSoldier, BOOLEAN fExplainWhyNot )
|
||||
{
|
||||
if ( fExplainWhyNot )
|
||||
{
|
||||
swprintf( sString, zMarksMapScreenText[ 6 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 6 ], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
|
||||
@@ -3011,7 +3011,7 @@ BOOLEAN IsSoldierCloseEnoughToADoctor( SOLDIERTYPE *pPatient )
|
||||
// there are doctors here but noone can heal this guy
|
||||
if( ( fDoctorInSector ) && ( fDoctorCloseEnough == FALSE ) )
|
||||
{
|
||||
swprintf( sString, pDoctorWarningString[ 0 ] , pPatient->name );
|
||||
swprintf( sString, pDoctorWarningString[ 0 ] , pPatient->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL);
|
||||
return( FALSE );
|
||||
}
|
||||
@@ -3961,12 +3961,12 @@ BOOLEAN RepairObject( SOLDIERTYPE * pSoldier, SOLDIERTYPE * pOwner, OBJECTTYPE *
|
||||
// report it as fixed
|
||||
if ( pSoldier == pOwner )
|
||||
{
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[ STR_REPAIRED ], pSoldier->name, ItemNames[ pObj->usItem ] );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, Message[ STR_REPAIRED ], pSoldier->GetName(), ItemNames[ pObj->usItem ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
// NOTE: may need to be changed for localized versions
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 35 ], pSoldier->name, pOwner->name, ItemNames[ pObj->usItem ] );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 35 ], pSoldier->GetName(), pOwner->GetName(), ItemNames[ pObj->usItem ] );
|
||||
}
|
||||
}
|
||||
if ( *pubRepairPtsLeft == 0 )
|
||||
@@ -4125,7 +4125,7 @@ void HandleRepairBySoldier( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
// No items left in queue: All items have been repaired
|
||||
if (itemsToFix.empty())
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 3 ], pSoldier->name );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 3 ], pSoldier->GetName() );
|
||||
else {
|
||||
// The current item was a weapon/armor
|
||||
if ( (IsWeapon(object.item->usItem) || Item[object.item->usItem].usItemClass == IC_ARMOUR) &&
|
||||
@@ -4134,7 +4134,7 @@ void HandleRepairBySoldier( SOLDIERTYPE *pSoldier )
|
||||
{
|
||||
|
||||
// All weapons & armor have been repaired
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 1 ], pSoldier->name );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 1 ], pSoldier->GetName() );
|
||||
StopTimeCompression();
|
||||
}
|
||||
}
|
||||
@@ -4219,7 +4219,7 @@ void HandleRepairBySoldier( SOLDIERTYPE *pSoldier )
|
||||
// if he fixed something of his, and now has no more of his own items to fix
|
||||
if ( fAnyOfSoldiersOwnItemsWereFixed && !DoesCharacterHaveAnyItemsToRepair( pSoldier, -1 ) )
|
||||
{
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 0 ], pSoldier->name );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 0 ], pSoldier->GetName() );
|
||||
|
||||
// let player react
|
||||
StopTimeCompression();
|
||||
@@ -5962,7 +5962,7 @@ void AssignmentAborted( SOLDIERTYPE *pSoldier, UINT8 ubReason )
|
||||
{
|
||||
AssertLT( ubReason, NUM_ASSIGN_ABORT_REASONS );
|
||||
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ ubReason ], pSoldier->name );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ ubReason ], pSoldier->GetName() );
|
||||
|
||||
StopTimeCompression();
|
||||
|
||||
@@ -6336,7 +6336,7 @@ BOOLEAN AutoSleepMerc( SOLDIERTYPE *pSoldier )
|
||||
}
|
||||
else
|
||||
{
|
||||
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s", pMercFellAsleepString[ 0 ], pSoldier->name );
|
||||
// ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s", pMercFellAsleepString[ 0 ], pSoldier->GetName() );
|
||||
}
|
||||
|
||||
|
||||
@@ -9231,26 +9231,29 @@ void SquadMenuBtnCallback( MOUSE_REGION * pRegion, INT32 iReason )
|
||||
switch( bCanJoinSquad )
|
||||
{
|
||||
case CHARACTER_CANT_JOIN_SQUAD_SQUAD_MOVING:
|
||||
swprintf( sString, pMapErrorString[ 36 ], pSoldier->name, pLongAssignmentStrings[ iValue ] );
|
||||
if ( gGameExternalOptions.fUseXMLSquadNames )
|
||||
swprintf( sString, pMapErrorString[ 36 ], pSoldier->GetName(), SquadNames[ iValue ].squadname );
|
||||
else
|
||||
swprintf( sString, pMapErrorString[ 36 ], pSoldier->GetName(), pLongAssignmentStrings[ iValue ] );
|
||||
break;
|
||||
case CHARACTER_CANT_JOIN_SQUAD_VEHICLE:
|
||||
swprintf( sString, pMapErrorString[ 37 ], pSoldier->name );
|
||||
swprintf( sString, pMapErrorString[ 37 ], pSoldier->GetName() );
|
||||
break;
|
||||
case CHARACTER_CANT_JOIN_SQUAD_TOO_FAR:
|
||||
if ( gGameExternalOptions.fUseXMLSquadNames )
|
||||
swprintf( sString, pMapErrorString[ 20 ], pSoldier->name, SquadNames[ iValue ].squadname );
|
||||
swprintf( sString, pMapErrorString[ 20 ], pSoldier->GetName(), SquadNames[ iValue ].squadname );
|
||||
else
|
||||
swprintf( sString, pMapErrorString[ 20 ], pSoldier->name, pLongAssignmentStrings[ iValue ] );
|
||||
swprintf( sString, pMapErrorString[ 20 ], pSoldier->GetName(), pLongAssignmentStrings[ iValue ] );
|
||||
break;
|
||||
case CHARACTER_CANT_JOIN_SQUAD_FULL:
|
||||
if ( gGameExternalOptions.fUseXMLSquadNames )
|
||||
swprintf( sString, pMapErrorString[ 19 ], pSoldier->name, SquadNames[ iValue ].squadname );
|
||||
swprintf( sString, pMapErrorString[ 19 ], pSoldier->GetName(), SquadNames[ iValue ].squadname );
|
||||
else
|
||||
swprintf( sString, pMapErrorString[ 19 ], pSoldier->name, pLongAssignmentStrings[ iValue ] );
|
||||
swprintf( sString, pMapErrorString[ 19 ], pSoldier->GetName(), pLongAssignmentStrings[ iValue ] );
|
||||
break;
|
||||
default:
|
||||
// generic "you can't join this squad" msg
|
||||
swprintf( sString, pMapErrorString[ 38 ], pSoldier->name, pLongAssignmentStrings[ iValue ] );
|
||||
swprintf( sString, pMapErrorString[ 38 ], pSoldier->GetName(), pLongAssignmentStrings[ iValue ] );
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -9793,7 +9796,7 @@ void AssignmentMenuBtnCallback( MOUSE_REGION * pRegion, INT32 iReason )
|
||||
{
|
||||
fTeamPanelDirty = TRUE;
|
||||
fMapScreenBottomDirty = TRUE;
|
||||
swprintf( sString, zMarksMapScreenText[ 19 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 19 ], pSoldier->GetName() );
|
||||
|
||||
DoScreenIndependantMessageBox( sString , MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
@@ -9937,7 +9940,7 @@ void AssignmentMenuBtnCallback( MOUSE_REGION * pRegion, INT32 iReason )
|
||||
{
|
||||
fTeamPanelDirty = TRUE;
|
||||
fMapScreenBottomDirty = TRUE;
|
||||
swprintf( sString, zMarksMapScreenText[ 18 ], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[ 18 ], pSoldier->GetName() );
|
||||
|
||||
DoScreenIndependantMessageBox( sString , MSG_BOX_FLAG_OK, NULL );
|
||||
}
|
||||
@@ -10250,7 +10253,7 @@ void PostContractMessage( SOLDIERTYPE *pCharacter, INT32 iContract )
|
||||
return;
|
||||
|
||||
// send a message stating that offer of contract extension made
|
||||
//MapScreenMessage(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Offered to extend %s's contract by another %s.", pCharacter->name, pContractExtendStrings[ iContract ] );
|
||||
//MapScreenMessage(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Offered to extend %s's contract by another %s.", pCharacter->GetName(), pContractExtendStrings[ iContract ] );
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -10262,7 +10265,7 @@ void PostTerminateMessage( SOLDIERTYPE *pCharacter )
|
||||
return;
|
||||
|
||||
// send a message stating that termination of contract done
|
||||
//MapScreenMessage(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s's contract has been terminated.", pCharacter->name );
|
||||
//MapScreenMessage(FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s's contract has been terminated.", pCharacter->GetName() );
|
||||
|
||||
}
|
||||
|
||||
@@ -13994,7 +13997,7 @@ void RepairItemsOnOthers( SOLDIERTYPE *pSoldier, UINT8 *pubRepairPtsLeft )
|
||||
|
||||
if ( fSomethingWasRepairedThisPass && !DoesCharacterHaveAnyItemsToRepair( pSoldier, ubPassType ) )
|
||||
{
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 1 + ubPassType ], pSoldier->name );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, sRepairsDoneString[ 1 + ubPassType ], pSoldier->GetName() );
|
||||
|
||||
// let player react
|
||||
StopTimeCompression();
|
||||
@@ -14030,12 +14033,12 @@ BOOLEAN UnjamGunsOnSoldier( SOLDIERTYPE *pOwnerSoldier, SOLDIERTYPE *pRepairSold
|
||||
// report it as unjammed
|
||||
if ( pRepairSoldier == pOwnerSoldier )
|
||||
{
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 53 ], pRepairSoldier->name, ItemNames[ pOwnerSoldier->inv[ bPocket ].usItem ] );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 53 ], pRepairSoldier->GetName(), ItemNames[ pOwnerSoldier->inv[ bPocket ].usItem ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
// NOTE: may need to be changed for localized versions
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 54 ], pRepairSoldier->name, pOwnerSoldier->name, ItemNames[ pOwnerSoldier->inv[ bPocket ].usItem ] );
|
||||
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, gzLateLocalizedString[ 54 ], pRepairSoldier->GetName(), pOwnerSoldier->GetName(), ItemNames[ pOwnerSoldier->inv[ bPocket ].usItem ] );
|
||||
}
|
||||
|
||||
fAnyGunsWereUnjammed = TRUE;
|
||||
@@ -14776,7 +14779,7 @@ BOOLEAN CanCharacterTrainMilitiaWithErrorReport( SOLDIERTYPE *pSoldier )
|
||||
if( !fSufficientLeadership )
|
||||
{
|
||||
// Report "Insufficient Leadership Skill"
|
||||
swprintf(sString, New113HAMMessage[6], pSoldier->name);
|
||||
swprintf(sString, New113HAMMessage[6], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return ( FALSE );
|
||||
}
|
||||
@@ -14930,7 +14933,7 @@ BOOLEAN CanCharacterTrainMobileMilitiaWithErrorReport( SOLDIERTYPE *pSoldier )
|
||||
if( !fSufficientLeadership )
|
||||
{
|
||||
// Report "Insufficient Leadership Skill"
|
||||
swprintf(sString, New113HAMMessage[6], pSoldier->name);
|
||||
swprintf(sString, New113HAMMessage[6], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return ( FALSE );
|
||||
}
|
||||
@@ -15956,79 +15959,79 @@ BOOLEAN CanCharacterFacilityWithErrorReport( SOLDIERTYPE *pSoldier, UINT8 ubFaci
|
||||
|
||||
if (pSoldier->stats.bStrength < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumStrength)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[0], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[0], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bDexterity < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumDexterity)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[1], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[1], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bAgility < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumAgility)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[2], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[2], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bLife < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumHealth)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[3], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[3], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bWisdom < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumWisdom)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[4], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[4], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bMarksmanship < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumMarksmanship)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[5], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[5], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bMedical < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumMedical)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[6], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[6], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bMechanical < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumMechanical)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[7], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[7], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bLeadership < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumLeadership)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[8], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[8], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bExplosive < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumExplosives)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[9], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[9], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->stats.bExpLevel < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumLevel)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[10], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[10], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->aiData.bMorale < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumMorale)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[11], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[11], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
if (pSoldier->bBreathMax < gFacilityTypes[ubFacilityType].AssignmentData[ubAssignmentType].ubMinimumBreath)
|
||||
{
|
||||
swprintf(sString, gzFacilityErrorMessage[12], pSoldier->name);
|
||||
swprintf(sString, gzFacilityErrorMessage[12], pSoldier->GetName());
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
@@ -16100,7 +16103,7 @@ BOOLEAN CanCharacterFacilityWithErrorReport( SOLDIERTYPE *pSoldier, UINT8 ubFaci
|
||||
|
||||
if( fFoundMedKit == FALSE )
|
||||
{
|
||||
swprintf( sString, zMarksMapScreenText[19], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[19], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
@@ -16113,7 +16116,7 @@ BOOLEAN CanCharacterFacilityWithErrorReport( SOLDIERTYPE *pSoldier, UINT8 ubFaci
|
||||
// make sure he has a toolkit
|
||||
if ( FindToolkit( pSoldier ) == NO_SLOT )
|
||||
{
|
||||
swprintf( sString, zMarksMapScreenText[18], pSoldier->name );
|
||||
swprintf( sString, zMarksMapScreenText[18], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
@@ -16124,7 +16127,7 @@ BOOLEAN CanCharacterFacilityWithErrorReport( SOLDIERTYPE *pSoldier, UINT8 ubFaci
|
||||
// items?
|
||||
if ( !DoesCharacterHaveAnyItemsToRepair( pSoldier, FINAL_REPAIR_PASS ) )
|
||||
{
|
||||
swprintf( sString, gzFacilityErrorMessage[16], pSoldier->name );
|
||||
swprintf( sString, gzFacilityErrorMessage[16], pSoldier->GetName() );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
return( FALSE );
|
||||
}
|
||||
|
||||
+42
-42
@@ -1234,15 +1234,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, STRAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, STRAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[0], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[0], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[0], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[0], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1286,15 +1286,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, AGILAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, AGILAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[1], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[1], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[1], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[1], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1344,9 +1344,9 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[2], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[2], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[2], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[2], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1390,15 +1390,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, WISDOMAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, WISDOMAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[3], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[3], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[3], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[3], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1447,7 +1447,7 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, HEALTHAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, HEALTHAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
if (pSoldier->stats.bLife >= OKLIFE)
|
||||
@@ -1455,9 +1455,9 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[4], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[4], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[4], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[4], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1467,9 +1467,9 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[28], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[28], pSoldier->GetName(), szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[29], pSoldier->name, gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[29], pSoldier->GetName(), gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
AddCharacterToAnySquad( pSoldier );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
@@ -1515,15 +1515,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, MARKAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, MARKAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[5], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[5], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[5], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[5], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1567,15 +1567,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, LDRAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, LDRAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[6], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[6], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[6], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[6], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1619,15 +1619,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, MECHANAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, MECHANAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[7], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[7], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[7], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[7], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1671,15 +1671,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, MEDICALAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, MEDICALAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[8], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[8], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[8], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[8], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1723,15 +1723,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
fBadResult = TRUE;
|
||||
|
||||
// Log message
|
||||
BuildStatChangeString( sString, pSoldier->name, FALSE, Result, EXPLODEAMT );
|
||||
BuildStatChangeString( sString, pSoldier->GetName(), FALSE, Result, EXPLODEAMT );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->name, gzFacilityRiskResultStrings[9], szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[17], pSoldier->GetName(), gzFacilityRiskResultStrings[9], szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->name, gzFacilityRiskResultStrings[9], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[18], pSoldier->GetName(), gzFacilityRiskResultStrings[9], gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1753,15 +1753,15 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
{
|
||||
// Log message
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[31], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[31], pSoldier->GetName(), szSectorGrid );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Do Screen Message, stop time, and take character off duty immediately.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[19], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[19], pSoldier->GetName(), szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[20], pSoldier->name, gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[20], pSoldier->GetName(), gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
AddCharacterToAnySquad( pSoldier );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
@@ -1770,16 +1770,16 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
{
|
||||
// Log message
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[30], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[30], pSoldier->GetName(), szSectorGrid );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// Soldier isn't bleeding too bad. Let the player know, but don't take any action.
|
||||
// Do Screen Message and stop time.
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[21], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[21], pSoldier->GetName(), szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[22], pSoldier->name, gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[22], pSoldier->GetName(), gFacilityTypes[ubFacilityType].szFacilityName, szSectorGrid );
|
||||
DoScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, NULL );
|
||||
StopTimeCompression();
|
||||
}
|
||||
@@ -1807,7 +1807,7 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
if (GetDrunkLevel(pSoldier) == BORDERLINE)
|
||||
{
|
||||
// Log message
|
||||
swprintf( sString, gzFacilityErrorMessage[27], pSoldier->name );
|
||||
swprintf( sString, gzFacilityErrorMessage[27], pSoldier->GetName() );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
}
|
||||
|
||||
@@ -1941,9 +1941,9 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
DecrementTownLoyalty( ubTownID, abs(Result) );
|
||||
// Log message
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[23], pTownNames[ubTownID], pSoldier->name );
|
||||
swprintf( sString, gzFacilityErrorMessage[23], pTownNames[ubTownID], pSoldier->GetName() );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[24], pTownNames[ubTownID], pSoldier->name, gFacilityTypes[ubFacilityType].szFacilityName );
|
||||
swprintf( sString, gzFacilityErrorMessage[24], pTownNames[ubTownID], pSoldier->GetName(), gFacilityTypes[ubFacilityType].szFacilityName );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// SANDRO - add to merc records - facility accidents counter
|
||||
@@ -1963,9 +1963,9 @@ void HandleRisksForSoldierFacilityAssignment( SOLDIERTYPE *pSoldier, UINT8 ubFac
|
||||
// Log message
|
||||
GetShortSectorString( pSoldier->sSectorX, pSoldier->sSectorY, szSectorGrid );
|
||||
if (!fOperatingFacility)
|
||||
swprintf( sString, gzFacilityErrorMessage[25], pSoldier->name, szSectorGrid );
|
||||
swprintf( sString, gzFacilityErrorMessage[25], pSoldier->GetName(), szSectorGrid );
|
||||
else
|
||||
swprintf( sString, gzFacilityErrorMessage[26], pSoldier->name, szSectorGrid, gFacilityTypes[ubFacilityType].szFacilityName );
|
||||
swprintf( sString, gzFacilityErrorMessage[26], pSoldier->GetName(), szSectorGrid, gFacilityTypes[ubFacilityType].szFacilityName );
|
||||
ScreenMsg( usColor, MSG_INTERFACE, sString );
|
||||
|
||||
// SANDRO - add to merc records - facility accidents counter
|
||||
|
||||
+11
-11
@@ -1146,11 +1146,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
|
||||
{
|
||||
if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE )
|
||||
{
|
||||
swprintf( sString, pMercHeLeaveString[ 4 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercHeLeaveString[ 4 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, pMercSheLeaveString[ 4 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercSheLeaveString[ 4 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
fInSector = TRUE;
|
||||
}
|
||||
@@ -1163,11 +1163,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
|
||||
{
|
||||
if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE )
|
||||
{
|
||||
swprintf( sString, L"%s %s", pSoldier->name, pMercHeLeaveString[ 3 ] );
|
||||
swprintf( sString, L"%s %s", pSoldier->GetName(), pMercHeLeaveString[ 3 ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, L"%s %s", pSoldier->name, pMercSheLeaveString[ 3 ] );
|
||||
swprintf( sString, L"%s %s", pSoldier->GetName(), pMercSheLeaveString[ 3 ] );
|
||||
}
|
||||
fInSector = TRUE;
|
||||
}
|
||||
@@ -1178,11 +1178,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
|
||||
|
||||
if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE )
|
||||
{
|
||||
swprintf( sString, pMercHeLeaveString[ 0 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercHeLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, pMercSheLeaveString[ 0 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercSheLeaveString[ 0 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1193,11 +1193,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
|
||||
{
|
||||
if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE )
|
||||
{
|
||||
swprintf( sString, L"%s %s", pSoldier->name, pMercHeLeaveString[ 2 ] );
|
||||
swprintf( sString, L"%s %s", pSoldier->GetName(), pMercHeLeaveString[ 2 ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, L"%s %s", pSoldier->name, pMercSheLeaveString[ 2 ] );
|
||||
swprintf( sString, L"%s %s", pSoldier->GetName(), pMercSheLeaveString[ 2 ] );
|
||||
}
|
||||
fInSector = TRUE;
|
||||
}
|
||||
@@ -1208,11 +1208,11 @@ void NotifyPlayerOfMercDepartureAndPromptEquipmentPlacement( SOLDIERTYPE *pSoldi
|
||||
|
||||
if( gMercProfiles[ pSoldier->ubProfile ].bSex == MALE )
|
||||
{
|
||||
swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercHeLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
else
|
||||
{
|
||||
swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->name, zShortTownIDString );
|
||||
swprintf( sString, pMercSheLeaveString[ 1 ], pSoldier->GetName(), zShortTownIDString );
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1508,7 +1508,7 @@ void HandleNotifyPlayerCanAffordInsurance( SOLDIERTYPE *pSoldier, UINT8 ubLength
|
||||
InsertCommasForDollarFigure( sStringA );
|
||||
InsertDollarSignInToString( sStringA );
|
||||
|
||||
swprintf( sString, zMarksMapScreenText[ 10 ], pSoldier->name, sStringA, ubLength );
|
||||
swprintf( sString, zMarksMapScreenText[ 10 ], pSoldier->GetName(), sStringA, ubLength );
|
||||
|
||||
//Set the length to the global variable ( so we know how long the contract is in the callback )
|
||||
gubContractLength = ubLength;
|
||||
|
||||
Reference in New Issue
Block a user