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

Oly start PMC hiring if > 0 militia have been selected

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-08-04 19:11:13 +00:00
parent abe7117231
commit 90486b015b
1 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/PMC.cpp
+42 -38
View File
@@ -527,58 +527,62 @@ void PMCTeamHireCallback( GUI_BUTTON *btn, INT32 reason )
{ {
if ( reason & MSYS_CALLBACK_REASON_LBUTTON_UP ) if ( reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
{ {
AddTransactionToPlayersBook( PMC_CONTRACT, 0, GetWorldTotalMin( ), (-1) * (INT32)(pmcdata[0].usToHire * GetMilitiaCostPMC( REGULAR_MILITIA ) + pmcdata[1].usToHire * GetMilitiaCostPMC( ELITE_MILITIA )) ); // only proceed if we selected people
if ( pmcdata[0].usToHire || pmcdata[1].usToHire )
PMCReinforcesHireEvent hiringevent;
// look for a free ID
UINT8 id = 0;
BOOLEAN found = FALSE;
for ( UINT8 i = 0; i < 255; ++i )
{ {
found = TRUE; AddTransactionToPlayersBook( PMC_CONTRACT, 0, GetWorldTotalMin( ), (-1) * (INT32)(pmcdata[0].usToHire * GetMilitiaCostPMC( REGULAR_MILITIA ) + pmcdata[1].usToHire * GetMilitiaCostPMC( ELITE_MILITIA )) );
PMCReinforcesHireEvent hiringevent;
std::vector<PMCReinforcesHireEvent>::iterator itend = gPMCHiringEvents.end(); // look for a free ID
for ( std::vector<PMCReinforcesHireEvent>::iterator it = gPMCHiringEvents.begin( ); it != itend; ++it ) UINT8 id = 0;
BOOLEAN found = FALSE;
for ( UINT8 i = 0; i < 255; ++i )
{ {
if ( (*it).usId == id ) found = TRUE;
std::vector<PMCReinforcesHireEvent>::iterator itend = gPMCHiringEvents.end();
for ( std::vector<PMCReinforcesHireEvent>::iterator it = gPMCHiringEvents.begin( ); it != itend; ++it )
{ {
++id; if ( (*it).usId == id )
found = FALSE; {
break; ++id;
found = FALSE;
break;
}
} }
if ( found = TRUE )
break;
} }
if ( found = TRUE ) hiringevent.usId = id;
break; hiringevent.usRegulars = pmcdata[0].usToHire;
} hiringevent.usVeterans = pmcdata[1].usToHire;
hiringevent.usSectorToArrive = (UINT8)DropDownTemplate<DROPDOWNNR_PMC_LOCATION>::getInstance( ).GetSelectedEntryKey( );
hiringevent.usTimeToArrive = GetWorldTotalMin() + 1440;
hiringevent.usId = id; gPMCData.usRegularsHired += hiringevent.usRegulars;
hiringevent.usRegulars = pmcdata[0].usToHire; gPMCData.usVeteransHired += hiringevent.usVeterans;
hiringevent.usVeterans = pmcdata[1].usToHire; gPMCData.usTotalMoneyEarned += pmcdata[0].usToHire * GetMilitiaCostPMC( REGULAR_MILITIA ) + pmcdata[1].usToHire * GetMilitiaCostPMC( ELITE_MILITIA );
hiringevent.usSectorToArrive = (UINT8)DropDownTemplate<DROPDOWNNR_PMC_LOCATION>::getInstance( ).GetSelectedEntryKey( );
hiringevent.usTimeToArrive = GetWorldTotalMin() + 1440;
gPMCData.usRegularsHired += hiringevent.usRegulars; gPMCHiringEvents.push_back( hiringevent );
gPMCData.usVeteransHired += hiringevent.usVeterans;
gPMCData.usTotalMoneyEarned += pmcdata[0].usToHire * GetMilitiaCostPMC( REGULAR_MILITIA ) + pmcdata[1].usToHire * GetMilitiaCostPMC( ELITE_MILITIA );
gPMCHiringEvents.push_back( hiringevent ); // The ETA is, well, just an ETA - randomise it a bit
UINT32 realarrivaltime = hiringevent.usTimeToArrive - 60 + Random(180);
// The ETA is, well, just an ETA - randomise it a bit AddStrategicEvent( EVENT_PMC_REINFORCEMENT_ARRIVAL, realarrivaltime, hiringevent.usId );
UINT32 realarrivaltime = hiringevent.usTimeToArrive - 60 + Random(180);
AddStrategicEvent( EVENT_PMC_REINFORCEMENT_ARRIVAL, realarrivaltime, hiringevent.usId );
gPMCData.usRegularsAvailable -= pmcdata[0].usToHire; gPMCData.usRegularsAvailable -= pmcdata[0].usToHire;
pmcdata[0].usToHire = 0; pmcdata[0].usToHire = 0;
gPMCData.usVeteransAvailable -= pmcdata[1].usToHire; gPMCData.usVeteransAvailable -= pmcdata[1].usToHire;
pmcdata[1].usToHire = 0; pmcdata[1].usToHire = 0;
CHAR16 sString[256]; CHAR16 sString[256];
swprintf( sString, szPMCWebSite[TEXT_PMC_CONFIRMATION], ((GetWorldTotalMin( ) + 1440) % 1440) / 60, ((GetWorldTotalMin( ) + 1440) % 1440) % 60 ); swprintf( sString, szPMCWebSite[TEXT_PMC_CONFIRMATION], ((GetWorldTotalMin( ) + 1440) % 1440) / 60, ((GetWorldTotalMin( ) + 1440) % 1440) % 60 );
DoLowerScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, PMCConfirmationCallback ); DoLowerScreenIndependantMessageBox( sString, MSG_BOX_FLAG_OK, PMCConfirmationCallback );
}
} }
} }