[Arkshine]

Well actually it would be more or less pointless since all the functions are the same as HLSDK except CWeaponbox::Touch(). In this latter, the difference would be only the support for the bomb, shield and grenades (check and max harcoded too).

[ConnorMcLeod]

if( m_fHasPrimaryWeapon )

if( pOther->m_fHasPrimaryWeapon )

[Arkshine]

Fixed.

[Arkshine]

Here, the CWeaponBox::Touch() source code :

PHP Code:

void CWeaponBox::Touch( CBaseEntity *pOther )
{
    if ( ~pev->flags & FL_ONGROUND || !pOther->IsPlayer() || !pOther->IsAlive() ) )
    {
        return;
    }

    if( pOther->m_fIsVIP || pOther->m_iUserPrefs & USERPREFS_SHIELD_DRAWN )
    {
        return;
    }

    pOther->OnTouchingWeapon( this );

    BOOL bPlayPickupSound;
    BOOL bUpdateAmmo;

    for( int iSlot = 0; iSlot < MAX_ITEM_TYPES; iSlot++ )
    {
        CBasePlayerItem *pItem;

        while( m_rgpPlayerItems[ iSlot ] )
        {
            pItem = m_rgpPlayerItems[ iSlot ];

            if( ( pOther->HasShield() && pItem->m_iId == WEAPON_ELITE ) || pOther->IsBot() && TheBots->IsWeaponUseable( pItem ) )
            {
                return;
            }

            if( FStrEq( STRING( pItem->pev->classname ), "weapon_c4" ) && pOther->m_iTeam == TEAM_TERRORIST && !pOther->pev->deadflags )
            {
                if( pOther->m_iUserPrefs & USERPREFS_SHIELD_DRAWN && ~m_fHudTextArgsDontResend & Bits_HINT_YOU_HAVE_THE_BOMB )
                {
                    m_fHudTextArgsDontResend |= Bits_HINT_YOU_HAVE_THE_BOMB;
                    pOther->HintMessage( "#Hint_you_have_the_bomb" );
                }
                else
                {
                    ClientPrint( pOther->pev, HUD_PRINTCENTER, "#Got_bomb" );
                }

                UTIL_LogPrintf( "\"%s<%i><%s><TERRORIST>\" triggered \"Got_The_Bomb\"\n",
                    STRING( pOther->pev->netname ),
                    GET_PLAYER_USERID( pOther->edict() ),
                    GET_PLAYER_AUTHID( pOther->edict() ) );

                g_pGameRules->m_bBombDropped = FALSE;

                MESSAGE_BEGIN( MSG_SPEC, SVC_DIRECTOR );
                WRITE_BYTE( 9 );
                WRITE_BYTE( DRC_CMD_EVENT );
                WRITE_SHORT( ENTINDEX( pOther->edict() ) );
                WRITE_SHORT( ENTINDEX( this->edict() ) );
                WRITE_ENTITY( 6 );
                MESSAGE_END();

                pOther->m_fDefusePlant |= CAN_PLANT_BOMB;
                pOther->SetBombIcon( FALSE );
                pOther->pev->body = 1;

                CBaseEntity *pEnt;

                while( ( pEnt = UTIL_FindEntityByClassname( pEnt, "player" ) ) != NULL )
                {
                    CBasePlayer *pIndex = UTIL_PlayerByIndex( pEnt );

                    if ( pIndex && !FNullEnt( pIndex->pev ) && pIndex->IsPlayer() && ~pIndex->pev->flags & FL_DORMANT )
                    {
                        CBasePlayer *pPlayer = GetClassPtr( ( CBasePlayer * ) pev );

                        if( !pPlayer->pev->deadflags && pPlayer->m_iTeam == TEAM_TERRORIST && pPlayer != pOther )
                        {
                            ClientPrint( pPlayer->pev, HUD_PRINTCENTER, "#Game_bomb_pickup" );

                            MESSAGE_BEGIN( MSG_ONE, gmsgBombPickup, NULL, pPlayer->edict() );
                            MESSAGE_END();
                        }
                    }
                }

                TheBots->SetLooseBomb( FALSE );
                TheBots->OnEvent( EVENT_BOMB_PICKUP, pOther->pev, NULL );
            }

            if( !( 1 <= iSlot <= 2 && pOther->m_rgpPlayerItems[ iSlot ] ) )
            {
                if( iSlot != 4 )
                {
                    if( ( !pOther->HasShield() || iSlot != 1 ) && pOther->AddPlayerItem( pItem ) )
                    {
                        pItem->AttachToPlayer( pOther );

                        bPlayPickupSound = TRUE;
                        bUpdateAmmo = TRUE;
                    }
                }
                else if( Item->IsWeapon() )
                {
                    char *szWeapon;
                    int iMax;

                    switch( pItem->m_iId )
                    {
                        case WEAPON_HEGRENADE   :
                        {
                            szWeapon = "weapon_hegrenade";
                            iMax = 1;
                            break;
                        }
                        case WEAPON_SMOKEGRNADE :
                        {
                            szWeapon = "weapon_smokegrenade";
                            iMax = 1;
                            break;
                        }
                        case WEAPON_FLASHBANG   :
                        {
                            szWeapon = "weapon_flashbang"
                            iMax = 2;
                            break;
                        }
                    }

                    if( pOther->m_rgAmmo[ m_iPrimaryAmmoType ] < iMax )
                    {
                        pOther->GiveNamedItem( szWeapon );

                        bPlayPickupSound = TRUE;
                        bUpdateAmmo = TRUE;
                    }
                }
            }

            m_rgpPlayerItems[ iSlot ] = m_rgpPlayerItems[ iSlot ]->m_pNext;
        }
    }

    if( bUpdateAmmo )
    {
        for( i = 0; i < MAX_AMMO_SLOTS; i++ )
        {
            if( !FStringNull( m_rgiszAmmo[ i ] ) )
            {
                pPlayer->GiveAmmo( m_rgAmmo[ i ], (char *)STRING( m_rgiszAmmo[ i ] ), MaxAmmoCarry( m_rgiszAmmo[ i ] ) );

                m_rgiszAmmo[ i ] = iStringNull;
                m_rgAmmo[ i ] = 0;
            }
        }

        SetTouch( NULL );
        UTIL_Remove( this );
    }

    if( bPlayPickupSound )
    {
        EMIT_SOUND( pOther->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM );
    }
} 


[Bugsy]

In your code it looks like a new grenade is being created and is not giving the player an existing grenade that's linked to the weaponbox. In code from weapons.cpp it looks like the player is given the existing entity.

weapons.cpp

PHP Code:

void CWeaponBox::Touch( CBaseEntity *pOther )
...
for ( i = 0 ; i < MAX_ITEM_TYPES ; i++ )
{
    if ( m_rgpPlayerItems[ i ] )
    {
        CBasePlayerItem *pItem;

        // have at least one weapon in this slot
        while ( m_rgpPlayerItems[ i ] )
        {
            //ALERT ( at_console, "trying to give %s\n", STRING( m_rgpPlayerItems[ i ]->pev->classname ) );

            pItem = m_rgpPlayerItems[ i ];
            m_rgpPlayerItems[ i ] = m_rgpPlayerItems[ i ]->m_pNext;// unlink this weapon from the box

            if ( pPlayer->AddPlayerItem( pItem ) )
            {
                pItem->AttachToPlayer( pPlayer );
            }
        }
    }
} 


CWeaponBox::Touch()

PHP Code:

else if( Item->IsWeapon() )
{
    char *weapon;
    int max;
    
    switch( pItem->m_iId )
    {
    case WEAPON_HEGRENADE   :
    {
        weapon = "weapon_hegrenade";
        max = 1;
        break;
    }
    case WEAPON_SMOKEGRNADE :
    {
        weapon = "weapon_smokegrenade";
        max = 1;
        break;
    }
    case WEAPON_FLASHBANG   : 
    {
        weapon = "weapon_flashbang"
        max = 2;
        break;
    }
    }
    
    if( pOther->m_rgAmmo[ m_iPrimaryAmmoType ] < max )
    {
    pOther->GiveNamedItem( weapon );
    
    bPlayPickupSound = TRUE;
    bUpdateAmmo = TRUE;
    }
}
 //... 


weapons.cpp

PHP Code:

void CBasePlayer::GiveNamedItem( const char *pszName )
{
    edict_t    *pent;

    int istr = MAKE_STRING(pszName);

    pent = CREATE_NAMED_ENTITY(istr);
    if ( FNullEnt( pent ) )
    {
        ALERT ( at_console, "NULL Ent in GiveNamedItem!\n" );
        return;
    }
    VARS( pent )->origin = pev->origin;
    pent->v.spawnflags |= SF_NORESPAWN;

    DispatchSpawn( pent );
    DispatchTouch( pent, ENT( pev ) );
} 


[Arkshine]

Interesting question. You know well by default in CS/CZ you can't drop grenades. I've just checked by testing to drop a grenade, I see weapon_hegrenade + weaponbox. Atfer I pickup this grenade, weaponbox has disappeared but I see two weapon_hegrenade. So, yes a new entity is well created. I don't know what happen for CZ when you die and you drop a grenade and you pickup after. [EDIT] It seems a new entity is created for CZ too. Since it's the same code it's quite normal. :p. Don't know why it's designed like that, something to fix for sure.. ^^

[Bugsy]

Originally Posted by Arkshine Interesting question. You know well by default in CS/CZ you can't drop grenades. I've just checked by testing to drop a grenade, I see weapon_hegrenade + weaponbox. Atfer I pickup this grenade, weaponbox has disappeared but I see two weapon_hegrenade. So, yes a new entity is well created. I don't know what happen for CZ when you die and you drop a grenade and you pickup after. [EDIT] It seems a new entity is created for CZ too. Since it's the same code it's quite normal. :p. Don't know why it's designed like that, something to fix for sure.. ^^

Interesting. Since CS was coded assuming nades would never be dropped they didn't bother to code the handling of this particular situation, which totally makes sense. I guess it only works because the engine treats it as any other weapon when dropped which allows it to still function, though not perfectly. I was playing around with dropping and picking up of nades and wanted to figure out exactly weaponbox\armoury_entity's operated. Thanks for your info.

[Exolent[jNr]]

@Arkshine
In CWeaponBox::Touch() you have this:

                    if( ( !pOther->HasShield() || iSlot != 1 ) && pPlayer->AddPlayerItem( pItem ) )
                    {
                        pItem->AttachToPlayer( pPlayer );
                        
                        bPlayPickupSound = TRUE;
                        bUpdateAmmo = TRUE;
                    }

pPlayer is never defined in a scope where it is accessible here.
Did you mean to use pOther?

Also, where could I see the code in AddPlayerItem()?

[Arkshine]

Yes, pOther, sorry.

You can see the code of this function in the HLSDK. It's the same.

[abdul-rehman]

pOther->HasShield

What is this operator "->" supposed to do ??
I know i am asking a question related to C/C++