mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
Focus skill: no watched location interrupt bonus if focus is active.
Improved data initialization. Smart tree top hiding: increased max distance to hide tree in vertical direction. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1073,20 +1073,7 @@ SOLDIERTYPE& SOLDIERTYPE::operator=(const OLDSOLDIERTYPE_101& src)
|
||||
for ( UINT8 i = 0; i < SOLDIER_COUNTER_MAX; ++i ) this->usSkillCounter[i] = 0;
|
||||
for ( UINT8 i = 0; i < SOLDIER_COOLDOWN_MAX; ++i ) this->usSkillCooldown[i] = 0;
|
||||
|
||||
this->ubLastShock = 0;
|
||||
this->ubLastSuppression = 0;
|
||||
this->ubLastAP = 0;
|
||||
this->ubLastMorale = 0;
|
||||
this->ubLastShockFromHit = 0;
|
||||
this->ubLastMoraleFromHit = 0;
|
||||
this->ubLastAPFromHit = 0;
|
||||
this->iLastBulletImpact = 0;
|
||||
this->iLastArmourProtection = 0;
|
||||
|
||||
this->usQuickItemId = 0;
|
||||
this->ubQuickItemSlot = 0;
|
||||
|
||||
this->usGrenadeItem = 0;
|
||||
this->InitializeExtraData();
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
@@ -1150,19 +1137,7 @@ void SOLDIERTYPE::initialize( )
|
||||
memset( &pathing, 0, sizeof(STRUCT_Pathing) );
|
||||
|
||||
// sevenfm:initialize additional data
|
||||
this->ubLastShock = 0;
|
||||
this->ubLastSuppression = 0;
|
||||
this->ubLastAP = 0;
|
||||
this->ubLastMorale = 0;
|
||||
this->ubLastShockFromHit = 0;
|
||||
this->ubLastMoraleFromHit = 0;
|
||||
this->ubLastAPFromHit = 0;
|
||||
this->iLastBulletImpact = 0;
|
||||
this->iLastArmourProtection = 0;
|
||||
this->usQuickItemId = 0;
|
||||
this->ubQuickItemSlot = 0;
|
||||
this->usDisabilityFlagMask = 0;
|
||||
this->sDragGridNo = NOWHERE;
|
||||
this->InitializeExtraData();
|
||||
}
|
||||
|
||||
bool SOLDIERTYPE::exists( )
|
||||
@@ -26013,3 +25988,21 @@ void SOLDIERTYPE::StartRadioAnimation(void)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void SOLDIERTYPE::InitializeExtraData(void)
|
||||
{
|
||||
this->ubLastShock = 0;
|
||||
this->ubLastSuppression = 0;
|
||||
this->ubLastAP = 0;
|
||||
this->ubLastMorale = 0;
|
||||
this->ubLastShockFromHit = 0;
|
||||
this->ubLastMoraleFromHit = 0;
|
||||
this->ubLastAPFromHit = 0;
|
||||
this->iLastBulletImpact = 0;
|
||||
this->iLastArmourProtection = 0;
|
||||
|
||||
this->usQuickItemId = 0;
|
||||
this->ubQuickItemSlot = 0;
|
||||
|
||||
this->usGrenadeItem = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user