mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- option menu descriptions changed
- bug fix: CTD in SendReinforcementsForGarrison. Happens in strategic map when a (maybe too large?) group of enemies wants to retake a city sector. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2701,12 +2701,12 @@ void SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoints
|
||||
//The force is strong enough to be able to take the sector.
|
||||
gubGarrisonReinforcementsDenied[ iDstGarrisonID ] = 0;
|
||||
}
|
||||
|
||||
|
||||
//The chance she will send them is related with the strength difference between the
|
||||
//player's force and the queen's.
|
||||
if( ubNumExtraReinforcements && fLimitMaxTroopsAllowable && iReinforcementsApproved == iMaxReinforcementsAllowed )
|
||||
{
|
||||
iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / usDefencePoints;
|
||||
{
|
||||
iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / max(usDefencePoints, 1); // lal bugfix: max 1 added to prevent division by 0
|
||||
if( !Chance( iChance ) )
|
||||
{
|
||||
ValidateWeights( 13 );
|
||||
@@ -2789,8 +2789,8 @@ void SendReinforcementsForGarrison( INT32 iDstGarrisonID, UINT16 usDefencePoints
|
||||
//The chance she will send them is related with the strength difference between the
|
||||
//player's force and the queen's.
|
||||
if( iReinforcementsApproved + ubNumExtraReinforcements == iMaxReinforcementsAllowed && usDefencePoints )
|
||||
{
|
||||
iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / usDefencePoints;
|
||||
{
|
||||
iChance = (iReinforcementsApproved + ubNumExtraReinforcements) * 100 / max(usDefencePoints, 1); // lal bugfix: max 1 added to prevent division by 0
|
||||
if( !Chance( iChance ) )
|
||||
{
|
||||
ValidateWeights( 18 );
|
||||
@@ -3946,9 +3946,9 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
|
||||
GROUP *pGroup, *pGroup0, *pGroup1, *pGroup2, *pGroup3, *pPendingGroup = NULL;
|
||||
SECTORINFO *pSector;
|
||||
UINT8 ubSectorID;
|
||||
UINT8 ubNumSoldiers;
|
||||
UINT8 ubSourceSectorID;
|
||||
UINT8 ubTargetSectorID;
|
||||
UINT8 ubNumSoldiers;
|
||||
|
||||
switch( usActionCode )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user