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

- Allows militia training for town sectors even when <townUsesLoyalty> tag set to FALSE (by Buggler)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-03-25 19:23:00 +00:00
parent 604ad13963
commit a0486b6b3f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Assignments.cpp
+10 -5
View File
@@ -1379,12 +1379,17 @@ BOOLEAN CanCharacterTrainMilitia( SOLDIERTYPE *pSoldier )
BOOLEAN DoesTownHaveRatingToTrainMilitia( INT8 bTownId ) BOOLEAN DoesTownHaveRatingToTrainMilitia( INT8 bTownId )
{ {
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Assignments1"); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Assignments1");
// min loyalty rating?
if( ( gTownLoyalty[ bTownId ].ubRating < gGameExternalOptions.iMinLoyaltyToTrain ) ) // Ignores check if FALSE, thereby allowing militia training for town sectors with deactivated loyalty tag
if (gfTownUsesLoyalty[ bTownId ])
{ {
// nope // min loyalty rating?
return( FALSE ); if( ( gTownLoyalty[ bTownId ].ubRating < gGameExternalOptions.iMinLoyaltyToTrain ) )
{
// nope
return( FALSE );
}
} }
return( TRUE ); return( TRUE );