1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix: militia, came as reinforcements, tend to stop at a halfway, if main battle is at the opposite side of map, they are coming from.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@662 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Lesh
2007-01-17 15:26:01 +00:00
parent f96b4374f1
commit a6a2307c56
1 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Init List.cpp
+43 -14
View File
@@ -2377,12 +2377,22 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu
if ( !pSoldier )
return;
pSoldier->bOrders = ONGUARD;
pSoldier->ubInsertionDirection = bDesiredDirection;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
// Lesh: militia came from another sector can't reach opposite side of map in case of battle there
// they are often stop at a half way. trying to fix this
if ( gTacticalStatus.Team[ MILITIA_TEAM ].bAwareOfOpposition )
{
pSoldier->bOrders = SEEKENEMY;
pSoldier->bAlertStatus = STATUS_RED;
}
else
{
pSoldier->bOrders = ONGUARD;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
}
//Setup the position
if( ubCurrSlot < MapEdgepointInfo.ubNumPoints )
@@ -2407,13 +2417,23 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu
if ( !pSoldier )
return;
pSoldier->bOrders = ONGUARD;
pSoldier->ubInsertionDirection = bDesiredDirection;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
// Lesh: militia came from another sector can't reach opposite side of map in case of battle there
// they are often stop at a half way. trying to fix this
if ( gTacticalStatus.Team[ MILITIA_TEAM ].bAwareOfOpposition )
{
pSoldier->bOrders = SEEKENEMY;
pSoldier->bAlertStatus = STATUS_RED;
}
else
{
pSoldier->bOrders = ONGUARD;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
}
//Setup the position
if( ubCurrSlot < MapEdgepointInfo.ubNumPoints )
{ //using an edgepoint
@@ -2437,13 +2457,22 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu
if ( !pSoldier )
return;
pSoldier->bOrders = ONGUARD;
pSoldier->ubInsertionDirection = bDesiredDirection;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
// Lesh: militia came from another sector can't reach opposite side of map in case of battle there
// they are often stop at a half way. trying to fix this
if ( gTacticalStatus.Team[ MILITIA_TEAM ].bAwareOfOpposition )
{
pSoldier->bOrders = SEEKENEMY;
pSoldier->bAlertStatus = STATUS_RED;
}
else
{
pSoldier->bOrders = ONGUARD;
pSoldier->bAlertStatus = STATUS_YELLOW;
pSoldier->sNoiseGridno = (INT16)(CENTRAL_GRIDNO + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) + ( Random( CENTRAL_RADIUS * 2 + 1 ) - CENTRAL_RADIUS ) * WORLD_COLS);
pSoldier->ubNoiseVolume = MAX_MISC_NOISE_DURATION;
}
// if ( GetTimeOfDayAmbientLightLevel() < NORMAL_LIGHTLEVEL_DAY + 2 )
// gTacticalStatus.Team[ ENEMY_TEAM ].bAwareOfOpposition = TRUE;