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

Massive effort to reign in militia problem. Still has issues :(

Browse Source 
Fix:  If only some of mercs go to a lower level (mine, basement, etc) but do not choose to "GO TO SECTOR", sector is still inaccessible from strategic map.  However, watch for triggers that might happen on first visit to a sector, that fail.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Overhaul
2007-07-19 08:33:17 +00:00
parent e2fa801e2b
commit 9d71fc89f0
16 changed files with 2017 additions and 1904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Town Militia.cpp
+50 -1
View File
@@ -119,7 +119,7 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
// force tactical to update militia status
gfStrategicMilitiaChangesMade = TRUE;
gfStrategicMilitiaChangesMade = FALSE;
// ok, so what do we do with all this training? Well, in order of decreasing priority:
// 1) If there's room in training sector, create new GREEN militia guys there
@@ -148,6 +148,11 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
{
// great! Create a new GREEN militia guy in the training sector
StrategicAddMilitiaToSector(sMapX, sMapY, GREEN_MILITIA, 1);
if (sMapX == gWorldSectorX && sMapY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
}
else
{
@@ -166,6 +171,11 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
// great! Create a new GREEN militia guy in the neighbouring sector
StrategicAddMilitiaToSector(sNeighbourX, sNeighbourY, GREEN_MILITIA, 1);
if (sNeighbourX == gWorldSectorX && sNeighbourY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
fFoundOne = TRUE;
break;
}
@@ -183,6 +193,10 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
// great! Promote a GREEN militia guy in the training sector to a REGULAR
StrategicPromoteMilitiaInSector(sMapX, sMapY, GREEN_MILITIA, 1);
fFoundOne = TRUE;
if (sMapX == gWorldSectorX && sMapY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
}
else
{
@@ -200,6 +214,11 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
// great! Promote a GREEN militia guy in the neighbouring sector to a REGULAR
StrategicPromoteMilitiaInSector(sNeighbourX, sNeighbourY, GREEN_MILITIA, 1);
if (sNeighbourX == gWorldSectorX && sNeighbourY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
fFoundOne = TRUE;
break;
}
@@ -217,6 +236,12 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
{
// great! Promote a REGULAR militia guy in the training sector to a VETERAN
StrategicPromoteMilitiaInSector(sMapX, sMapY, REGULAR_MILITIA, 1);
if (sMapX == gWorldSectorX && sMapY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
fFoundOne = TRUE;
}
else
@@ -235,6 +260,11 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
// great! Promote a Regular militia guy in the neighbouring sector to a Veteran
StrategicPromoteMilitiaInSector(sNeighbourX, sNeighbourY, REGULAR_MILITIA, 1);
if (sNeighbourX == gWorldSectorX && sNeighbourY == gWorldSectorY)
{
gfStrategicMilitiaChangesMade = TRUE;
}
fFoundOne = TRUE;
break;
}
@@ -258,6 +288,10 @@ void TownMilitiaTrainingCompleted( SOLDIERTYPE *pTrainer, INT16 sMapX, INT16 sMa
ubMilitiaTrained++;
}
if (gfStrategicMilitiaChangesMade)
{
ResetMilitia();
}
// if anyone actually got trained
if (ubMilitiaTrained > 0)
@@ -333,6 +367,11 @@ void StrategicAddMilitiaToSector(INT16 sMapX, INT16 sMapY, UINT8 ubRank, UINT8 u
pSectorInfo->ubNumberOfCivsAtLevel[ ubRank ] += ubHowMany;
if (ubHowMany && sMapX == gWorldSectorX && sMapY == gWorldSectorY )
{
gfStrategicMilitiaChangesMade = TRUE;
}
// update the screen display
fMapPanelDirty = TRUE;
}
@@ -354,6 +393,11 @@ void StrategicPromoteMilitiaInSector(INT16 sMapX, INT16 sMapY, UINT8 ubCurrentRa
pSectorInfo->ubNumberOfCivsAtLevel[ ubCurrentRank ] -= ubHowMany;
pSectorInfo->ubNumberOfCivsAtLevel[ ubCurrentRank + 1 ] += ubHowMany;
if (ubHowMany && sMapX == gWorldSectorX && sMapY == gWorldSectorY )
{
gfStrategicMilitiaChangesMade = TRUE;
}
// update the screen display
fMapPanelDirty = TRUE;
}
@@ -374,6 +418,11 @@ void StrategicRemoveMilitiaFromSector(INT16 sMapX, INT16 sMapY, UINT8 ubRank, UI
pSectorInfo->ubNumberOfCivsAtLevel[ ubRank ] -= ubHowMany;
if (ubHowMany && sMapX == gWorldSectorX && sMapY == gWorldSectorY )
{
gfStrategicMilitiaChangesMade = TRUE;
}
// update the screen display
fMapPanelDirty = TRUE;
}