celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initial Mapbase commit (squashed from mapbase-beta)

Browse Source
This commit is contained in:
Blixibon
2019-08-31 19:28:20 +00:00
parent 0d8dceea43
commit 3d464bc051
816 changed files with 105527 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sp/src/game/server/ai_behavior_lead.cpp
View File

@@ -543,8 +543,12 @@ int CAI_LeadBehavior::SelectSchedule()
if ( !m_flWeaponSafetyTimeOut || (m_flWeaponSafetyTimeOut > gpGlobals->curtime) )
return SCHED_LEAD_PLAYERNEEDSWEAPON;
#ifdef MAPBASE
pFollower->GiveNamedItem( STRING(m_weaponname) );
#else
string_t iszItem = AllocPooledString( "weapon_bugbait" );
pFollower->GiveNamedItem( STRING(iszItem) );
#endif
}
}
@@ -1649,6 +1653,9 @@ public:
private:
string_t m_iszWeaponName;
#ifdef MAPBASE
float m_flTimeoutTime = 60;
#endif
string_t m_iszMissingWeaponConceptModifier;
DECLARE_DATADESC();
@@ -1664,6 +1671,9 @@ LINK_ENTITY_TO_CLASS( ai_goal_lead_weapon, CAI_LeadGoal_Weapon );
BEGIN_DATADESC( CAI_LeadGoal_Weapon )
DEFINE_KEYFIELD( m_iszWeaponName, FIELD_STRING, "WeaponName"),
#ifdef MAPBASE
DEFINE_KEYFIELD( m_flTimeoutTime, FIELD_FLOAT, "TimeoutTime" ),
#endif
DEFINE_KEYFIELD( m_iszMissingWeaponConceptModifier, FIELD_STRING, "MissingWeaponConceptModifier"),
END_DATADESC()
@@ -1688,6 +1698,10 @@ void CAI_LeadGoal_Weapon::InputActivate( inputdata_t &inputdata )
CAI_LeadBehavior *pBehavior = GetLeadBehavior();
if ( pBehavior )
{
#ifdef MAPBASE
pBehavior->SetWaitForWeapon( m_iszWeaponName, m_flTimeoutTime );
#else
pBehavior->SetWaitForWeapon( m_iszWeaponName );
#endif
}
}