Skip to content

Add random spawn type for env_headcrabcanister #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Blixibon merged 3 commits into from
Jan 10, 2025
Merged

Add random spawn type for env_headcrabcanister #292

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2113410
Add random spawn type for env_headcrabcanister
arbabf Apr 12, 2024
f370074
Fix spacing to be more consistent
arbabf Apr 12, 2024
2c001ff
Change RANDOM_CRAB_TYPE to -1
arbabf Apr 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions sp/src/game/server/hl2/env_headcrabcanister.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ ConVar sk_env_headcrabcanister_shake_radius( "sk_env_headcrabcanister_shake_radi
ConVar sk_env_headcrabcanister_shake_radius_vehicle( "sk_env_headcrabcanister_shake_radius_vehicle", "2500" );

#define ENV_HEADCRABCANISTER_TRAIL_TIME 3.0f
#ifdef MAPBASE
#define RANDOM_CRAB_TYPE -1
#endif

//-----------------------------------------------------------------------------
// Spawn flags
Expand Down Expand Up @@ -258,7 +261,22 @@ void CEnvHeadcrabCanister::Precache( void )
PrecacheScriptSound( "HeadcrabCanister.SkyboxExplosion" );
PrecacheScriptSound( "HeadcrabCanister.Open" );

#ifdef MAPBASE
if ( m_nHeadcrabType != RANDOM_CRAB_TYPE )
{
UTIL_PrecacheOther( s_pHeadcrabClass[m_nHeadcrabType] );
}
else
{
// precache all the headcrabs if we're spawning random species
for ( int i = 0; i < ARRAYSIZE( s_pHeadcrabClass ); i++ )
{
UTIL_PrecacheOther( s_pHeadcrabClass[i] );
}
}
#else
UTIL_PrecacheOther( s_pHeadcrabClass[m_nHeadcrabType] );
#endif
}


Expand Down Expand Up @@ -733,7 +751,17 @@ void CEnvHeadcrabCanister::HeadcrabCanisterSpawnHeadcrabThink()
int nHeadCrabAttachment = LookupAttachment( "headcrab" );
if ( GetAttachment( nHeadCrabAttachment, vecSpawnPosition, vecSpawnAngles ) )
{
#ifdef MAPBASE
int iHeadcrabType = m_nHeadcrabType;
if ( m_nHeadcrabType == RANDOM_CRAB_TYPE )
{
iHeadcrabType = RandomInt( 0, ARRAYSIZE( s_pHeadcrabClass ) - 1 );
}

CBaseEntity *pEnt = CreateEntityByName( s_pHeadcrabClass[iHeadcrabType] );
#else
CBaseEntity *pEnt = CreateEntityByName( s_pHeadcrabClass[m_nHeadcrabType] );
#endif
CBaseHeadcrab *pHeadCrab = assert_cast<CBaseHeadcrab*>(pEnt);

// Necessary to get it to eject properly (don't allow the NPC
Expand Down