diff --git a/GameVersion.cpp b/GameVersion.cpp index 903a118b8..7a826cd3d 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.144" }; + INT16 zVersionLabel[256] = { L"Release v1.13.146" }; #endif diff --git a/JA2.vcproj b/JA2.vcproj index bbf93ff46..c7c1a17c3 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ 0 ? TRUE : FALSE; + BOOLEAN fMilitiaAlreadyBeen = CountMilitia(pSectorInfo )>0 && gWorldSectorX == sMapX && gWorldSectorX == sMapY && gbWorldSectorZ == 0; guiDirNumber = 0; diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp index 4f882434f..825288e56 100644 --- a/Tactical/Militia Control.cpp +++ b/Tactical/Militia Control.cpp @@ -159,10 +159,17 @@ void PrepareMilitiaForTactical() for( x = 0 ; x < guiDirNumber ; ++x ) { // ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%ld,%ld,%ld,%ld", gpAttackDirs[ x ][ 0 ], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2], gpAttackDirs[ x ][3] ); - if( gpAttackDirs[ x ][ 3 ] != INSERTION_CODE_CENTER ) - AddSoldierInitListMilitiaOnEdge( gpAttackDirs[ x ][ 3 ], gpAttackDirs[ x ][0], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2] ); -// AddSoldierInitListMilitia( gpAttackDirs[ x ][0], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2] ); -// else + if( gfMSResetMilitia ) + { + if( gpAttackDirs[ x ][ 3 ] != INSERTION_CODE_CENTER ) + AddSoldierInitListMilitiaOnEdge( gpAttackDirs[ x ][ 3 ], gpAttackDirs[ x ][0], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2] ); + } + else + if( gpAttackDirs[ x ][ 3 ] == INSERTION_CODE_CENTER ) + AddSoldierInitListMilitia( gpAttackDirs[ x ][0], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2] ); + else + AddSoldierInitListMilitiaOnEdge( gpAttackDirs[ x ][ 3 ], gpAttackDirs[ x ][0], gpAttackDirs[ x ][1], gpAttackDirs[ x ][2] ); + } else AddSoldierInitListMilitia( ubGreen, ubRegs, ubElites ); diff --git a/Tactical/Soldier Init List.cpp b/Tactical/Soldier Init List.cpp index 6a03342e0..5cc06b7dc 100644 --- a/Tactical/Soldier Init List.cpp +++ b/Tactical/Soldier Init List.cpp @@ -2367,7 +2367,7 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu ubTotalSoldiers--; pSoldier = TacticalCreateMilitia(SOLDIER_CLASS_ELITE_MILITIA); - pSoldier->bOrders = SEEKENEMY; + pSoldier->bOrders = ONGUARD; pSoldier->ubInsertionDirection = bDesiredDirection; pSoldier->bAlertStatus = STATUS_YELLOW; @@ -2392,7 +2392,7 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu ubTotalSoldiers--; pSoldier = TacticalCreateMilitia(SOLDIER_CLASS_REG_MILITIA); - pSoldier->bOrders = SEEKENEMY; + pSoldier->bOrders = ONGUARD; pSoldier->ubInsertionDirection = bDesiredDirection; pSoldier->bAlertStatus = STATUS_YELLOW; @@ -2417,7 +2417,7 @@ void AddSoldierInitListMilitiaOnEdge( UINT8 ubStrategicInsertionCode, UINT8 ubNu ubTotalSoldiers--; pSoldier = TacticalCreateMilitia(SOLDIER_CLASS_GREEN_MILITIA); - pSoldier->bOrders = SEEKENEMY; + pSoldier->bOrders = ONGUARD; pSoldier->ubInsertionDirection = bDesiredDirection; pSoldier->bAlertStatus = STATUS_YELLOW;