- Made the "Rifle sling" feature optional, so we can decide if we like to build an executable with/without the feature

o See: builddefines.h: #define ENABLE_RIFLE_SLING
o Note: This feature is NOT the strategy performance killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-06 13:43:34 +00:00
parent cecdc22d61
commit de6c84d4a9
4 changed files with 15 additions and 0 deletions
+4
View File
@@ -9477,6 +9477,7 @@ UINT8 SOLDIERTYPE::SoldierTakeDamage( INT8 bHeight, INT16 sLifeDeduct, INT16 sPo
// OK, drop item in main hand...
if ( this->inv[ HANDPOS ].exists() == true )
{
#ifdef ENABLE_RIFLE_SLING
// Flugente: If item has an attached rifle sling, place it the sling position instead
int bSlot = GUNSLINGPOCKPOS;
if ( HasAttachmentOfClass(&(this->inv[ HANDPOS ]), AC_SLING) && TryToPlaceInSlot(this, &(this->inv[ HANDPOS ]), FALSE, bSlot, GUNSLINGPOCKPOS) )
@@ -9484,6 +9485,9 @@ UINT8 SOLDIERTYPE::SoldierTakeDamage( INT8 bHeight, INT16 sLifeDeduct, INT16 sPo
;
}
else if ( !( this->inv[ HANDPOS ].fFlags & OBJECT_UNDROPPABLE ) )
#else
if ( !( this->inv[ HANDPOS ].fFlags & OBJECT_UNDROPPABLE ) )
#endif
{
// ATE: if our guy, make visible....
if ( this->bTeam == gbPlayerNum )