A gun only counts as mounted if it is raised. This does not alter shooting mechanics and removes unnecessary code changes. As a sideeffect, mercs will complain less often about other mercs using them as weapon racks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-01-17 22:21:34 +00:00
parent 3f7bbdc423
commit 33316bcac8
+4
View File
@@ -14387,6 +14387,10 @@ BOOLEAN SOLDIERTYPE::IsWeaponMounted( void )
else
return(FALSE);
}
// a gun can only be mounted if it's ready. The bonus is only relevant when this is true anyway (firing cth calculations require us to aim).
// Drawback is that we do not know whether we will the bonus until we raise our gun - but then again the entire 'get behind a rock and then look over it' system isn't exactly complicated to understand.
else if ( !WeaponReady( this ) )
return FALSE;
// we determine the height of the next tile in our direction. Because of the way structures are handled, we sometimes have to take the very tile we're occupying right now
INT32 nextGridNoinSight = this->sGridNo;