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

fix: on map screen number of enemy troops in a sector was displayed incorrectly if there was one player unit besides the sector and another unit was diagonal to it and ALLOW_DETECTION_IN_DIAGONAL_SECTORS was FALSE.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2015-02-15 13:36:58 +00:00
parent 33cb09366c
commit 38cb0f8ffc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Town Militia.cpp
+11 -11
View File
@@ -1288,13 +1288,14 @@ BOOLEAN CanSomeoneNearbyScoutThisSector( INT16 sSectorX, INT16 sSectorY, BOOLEAN
INT16 sSectorValue = 0, sSector = 0; INT16 sSectorValue = 0, sSector = 0;
INT16 sCounterA = 0, sCounterB = 0; INT16 sCounterA = 0, sCounterB = 0;
UINT8 ubScoutingRange = 1; UINT8 ubScoutingRange = 1;
BOOLEAN bScout = FALSE;
// get the sector value // get the sector value
sSector = sSectorX + sSectorY * MAP_WORLD_X; sSector = sSectorX + sSectorY * MAP_WORLD_X;
for( sCounterA = sSectorX - ubScoutingRange; sCounterA <= sSectorX + ubScoutingRange; ++sCounterA ) for( sCounterA = sSectorX - ubScoutingRange; (sCounterA <= sSectorX + ubScoutingRange && !bScout); ++sCounterA )
{ {
for( sCounterB = sSectorY - ubScoutingRange; sCounterB <= sSectorY + ubScoutingRange; ++sCounterB ) for( sCounterB = sSectorY - ubScoutingRange; (sCounterB <= sSectorY + ubScoutingRange && !bScout); ++sCounterB )
{ {
// skip out of bounds sectors // skip out of bounds sectors
if ( ( sCounterA < 1 ) || ( sCounterA > 16 ) || ( sCounterB < 1 ) || ( sCounterB > 16 ) ) if ( ( sCounterA < 1 ) || ( sCounterA > 16 ) || ( sCounterB < 1 ) || ( sCounterB > 16 ) )
@@ -1304,6 +1305,11 @@ BOOLEAN CanSomeoneNearbyScoutThisSector( INT16 sSectorX, INT16 sSectorY, BOOLEAN
sSectorValue = SECTOR( sCounterA, sCounterB ); sSectorValue = SECTOR( sCounterA, sCounterB );
// check if any sort of militia here
if ( NumNonPlayerTeamMembersInSector( sCounterA, sCounterB, MILITIA_TEAM ) )
{
return( TRUE );
}
// SANDRO - STOMP traits - Scouting check // SANDRO - STOMP traits - Scouting check
if (fScoutTraitCheck && gGameOptions.fNewTraitSystem && ScoutIsPresentInSquad( sCounterA, sCounterB )) if (fScoutTraitCheck && gGameOptions.fNewTraitSystem && ScoutIsPresentInSquad( sCounterA, sCounterB ))
{ {
@@ -1314,23 +1320,17 @@ BOOLEAN CanSomeoneNearbyScoutThisSector( INT16 sSectorX, INT16 sSectorY, BOOLEAN
(sCounterA + 1 == sSectorX && sCounterB + 1 == sSectorY) || (sCounterA + 1 == sSectorX && sCounterB + 1 == sSectorY) ||
(sCounterA + 1 == sSectorX && sCounterB - 1 == sSectorY))) (sCounterA + 1 == sSectorX && sCounterB - 1 == sSectorY)))
{ {
return( FALSE ); continue;
} }
else else
return( TRUE );
}
else
{
// check if any sort of militia here
if ( NumNonPlayerTeamMembersInSector( sCounterA, sCounterB, MILITIA_TEAM ) )
{ {
return( TRUE ); bScout = TRUE;
} }
} }
} }
} }
return( FALSE ); return( bScout );
} }
BOOLEAN IsTownFullMilitia( INT8 bTownId, INT8 iMilitiaType ) BOOLEAN IsTownFullMilitia( INT8 bTownId, INT8 iMilitiaType )