mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Work has begun to enable strategic movement for other teams than just player and enemy.
- I've changed the GROUP struct - instead of BOOLEAN fPlayer we now have UINT8 usGroupTeam. - To further simplify the code, I've replaced UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); with UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam ); In the next days, more strategic functions will be simplified, merged and replaced. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -361,7 +361,7 @@ void HandleDisease()
|
||||
}
|
||||
|
||||
// the bulk of doctoring will come from the military
|
||||
doctors += NumEnemiesInSector( sX, sY ) * GetMilitaryPopulationDoctorRate( );
|
||||
doctors += NumNonPlayerTeamMembersInSector( sX, sY, ENEMY_TEAM ) * GetMilitaryPopulationDoctorRate( );
|
||||
|
||||
UINT32 doctorpower = doctors * GetPopulationDoctorPoints( );
|
||||
|
||||
@@ -479,8 +479,7 @@ UINT16 GetSectorPopulation( INT16 sX, INT16 sY, BOOLEAN fWithMilitary )
|
||||
if ( fWithMilitary )
|
||||
{
|
||||
// add number of enemies...
|
||||
UINT16 sNumberOfEnemies = NumEnemiesInSector( sX, sY );
|
||||
population += sNumberOfEnemies;
|
||||
population += NumNonPlayerTeamMembersInSector( sX, sY, ENEMY_TEAM );
|
||||
}
|
||||
|
||||
return population;
|
||||
|
||||
Reference in New Issue
Block a user