Skip to content

return weapon handle in GiveWeapon script function #1012

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

Open
jhh8 wants to merge 2 commits into
base: reactivedrop_beta
Choose a base branch
from
+6 −4
Open

return weapon handle in GiveWeapon script function #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe74e8a
return weapon handle in GiveWeapon script function
jhh8 Dec 20, 2025
233c15e
update desc
jhh8 Dec 20, 2025
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
8 changes: 5 additions & 3 deletions src/game/server/swarm/asw_marine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ BEGIN_ENT_SCRIPTDESC( CASW_Marine, CASW_Inhabitable_NPC, "Marine" )
DEFINE_SCRIPTFUNC_NAMED( ScriptBecomeInfested, "BecomeInfested", "Infests the marine." )
DEFINE_SCRIPTFUNC_NAMED( ScriptCureInfestation, "CureInfestation", "Cures an infestation." )
DEFINE_SCRIPTFUNC_NAMED( ScriptGiveAmmo, "GiveAmmo", "Gives the marine ammo for the specified ammo index." )
DEFINE_SCRIPTFUNC_NAMED( ScriptGiveWeapon, "GiveWeapon", "Gives the marine a weapon." )
DEFINE_SCRIPTFUNC_NAMED( ScriptGiveWeapon, "GiveWeapon", "Gives the marine a weapon. Returns the weapon's handle." )
DEFINE_SCRIPTFUNC_NAMED( ScriptDropWeapon, "DropWeapon", "Makes the marine drop a weapon." )
DEFINE_SCRIPTFUNC_NAMED( ScriptRemoveWeapon, "RemoveWeapon", "Removes a weapon from the marine." )
DEFINE_SCRIPTFUNC_NAMED( ScriptSwitchWeapon, "SwitchWeapon", "Make the marine switch to a weapon" )
Expand Down Expand Up @@ -3476,13 +3476,13 @@ void CASW_Marine::ScriptGiveAmmo( int iCount, int iAmmoIndex )
GiveAmmo( iCount, iAmmoIndex, false );
}

void CASW_Marine::ScriptGiveWeapon( const char *pszName, int slot )
HSCRIPT CASW_Marine::ScriptGiveWeapon( const char *pszName, int slot )
{
CASW_Weapon* pWeapon = dynamic_cast<CASW_Weapon*>(Weapon_Create(pszName));
if ( !pWeapon )
{
Msg( "NULL Ent in GiveWeapon!\n" );
return;
return NULL;
}

int weaponIndex = GetWeaponPositionForPickup( pWeapon->GetClassname(), pWeapon->m_bIsTemporaryPickup );
Expand All @@ -3505,6 +3505,8 @@ void CASW_Marine::ScriptGiveWeapon( const char *pszName, int slot )
int iClips = GetAmmoDef()->MaxCarry( pWeapon->GetPrimaryAmmoType(), this );
GiveAmmo( iClips, pWeapon->GetPrimaryAmmoType(), true );
}

return ToHScript( pWeapon );
}

bool CASW_Marine::ScriptDropWeapon( int iWeaponIndex )
Expand Down
2 changes: 1 addition & 1 deletion src/game/server/swarm/asw_marine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ class CASW_Marine : public CASW_VPhysics_NPC, public IASWPlayerAnimStateHelpers,
int m_nIndexActWeapBeforeTempPickup;

void ScriptGiveAmmo( int iCount, int iAmmoIndex );
void ScriptGiveWeapon( const char *pszName, int slot );
HSCRIPT ScriptGiveWeapon( const char *pszName, int slot );
bool ScriptDropWeapon( int iWeaponIndex );
bool ScriptRemoveWeapon( int iWeaponIndex );
bool ScriptSwitchWeapon( int iWeaponIndex );
Expand Down