From 20e3b6cf941f5498b9e0c0f4031fd31a62c1b621 Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 13 Oct 2014 20:23:51 +0000 Subject: [PATCH] Fix: player could not order artillery from militia (by Ocular) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7564 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 12149c31f..74c1f0544 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -17820,7 +17820,8 @@ BOOLEAN SOLDIERTYPE::CanAnyArtilleryStrikeBeOrdered( UINT32* pSectorID ) // can if ( loopX < 1 || loopX >= MAP_WORLD_X - 1 || loopY < 1 || loopY >= MAP_WORLD_Y - 1 ) continue; - if ( IsValidArtilleryOrderSector( loopX, loopY, this->bSectorZ, this->bTeam ) ) + // as the player team can order artillery from the militia, we have to check that too. + if ( IsValidArtilleryOrderSector( loopX, loopY, this->bSectorZ, this->bTeam ) || (this->bTeam == gbPlayerNum && IsValidArtilleryOrderSector( loopX, loopY, this->bSectorZ, MILITIA_TEAM )) ) { *pSectorID = (UINT32)SECTOR( loopX, loopY ); return TRUE;