YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-12 16:07:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'induction' into mobile_hacks

Browse Source
This commit is contained in:
Andrey Akhmichin 2019-11-30 17:55:58 +05:00
commit 0100fcf235
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/flashlight.cpp
View File

@ -111,7 +111,7 @@ int CHudFlashlight::Draw( float flTime )
if( gEngfuncs.IsSpectateOnly() ) if( gEngfuncs.IsSpectateOnly() )
return 1; return 1;
if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_SUIT ) ) ) ) if( !( gHUD.m_iWeaponBits & ( 1 << ( WEAPON_FLASHLIGHT ) ) ) )
return 1; return 1;
if( m_fOn ) if( m_fOn )

2
dlls/cdll_dll.h
View File

@ -40,6 +40,6 @@
#define HUD_PRINTTALK 3 #define HUD_PRINTTALK 3
#define HUD_PRINTCENTER 4 #define HUD_PRINTCENTER 4
#define WEAPON_FLASHLIGHT 30
#define WEAPON_SUIT 31 #define WEAPON_SUIT 31
#endif #endif

30
dlls/items.cpp
View File

@ -70,6 +70,9 @@ void CWorldItem::Spawn( void )
case 45: // ITEM_SUIT: case 45: // ITEM_SUIT:
pEntity = CBaseEntity::Create( "item_suit", pev->origin, pev->angles ); pEntity = CBaseEntity::Create( "item_suit", pev->origin, pev->angles );
break; break;
case 46: // ITEM_FLASHLIGHT:
pEntity = CBaseEntity::Create( "item_flashlight", pev->origin, pev->angles );
break;
} }
if( !pEntity ) if( !pEntity )
@ -366,6 +369,33 @@ class CItemSecurity : public CItem
LINK_ENTITY_TO_CLASS( item_security, CItemSecurity ) LINK_ENTITY_TO_CLASS( item_security, CItemSecurity )
class CItemFlashlight : public CItem
{
void Spawn( void )
{
Precache();
SET_MODEL( ENT( pev ), "models/w_flashlight.mdl" );
CItem::Spawn();
}
void Precache( void )
{
PRECACHE_MODEL( "models/w_flashlight.mdl" );
PRECACHE_SOUND( "items/gunpickup2.wav" );
}
BOOL MyTouch( CBasePlayer *pPlayer )
{
if( pPlayer->pev->weapons & ( 1 << WEAPON_FLASHLIGHT ) )
return FALSE;
EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM );
pPlayer->pev->weapons |= ( 1 << WEAPON_FLASHLIGHT );
return TRUE;
}
};
LINK_ENTITY_TO_CLASS( item_flashlight, CItemFlashlight )
class CItemLongJump : public CItem class CItemLongJump : public CItem
{ {
void Spawn( void ) void Spawn( void )

2
dlls/player.cpp
View File

@ -3295,7 +3295,7 @@ void CBasePlayer::FlashlightTurnOn( void )
return; return;
} }
if( (pev->weapons & ( 1 << WEAPON_SUIT ) ) ) if( (pev->weapons & ( 1 << WEAPON_FLASHLIGHT ) ) )
{ {
EMIT_SOUND_DYN( ENT( pev ), CHAN_WEAPON, SOUND_FLASHLIGHT_ON, 1.0, ATTN_NORM, 0, PITCH_NORM ); EMIT_SOUND_DYN( ENT( pev ), CHAN_WEAPON, SOUND_FLASHLIGHT_ON, 1.0, ATTN_NORM, 0, PITCH_NORM );
SetBits( pev->effects, EF_DIMLIGHT ); SetBits( pev->effects, EF_DIMLIGHT );

1
dlls/weapons.h
View File

@ -81,6 +81,7 @@ public:
#define WEAPON_ALLWEAPONS (~(1<<WEAPON_SUIT)) #define WEAPON_ALLWEAPONS (~(1<<WEAPON_SUIT))
#define WEAPON_FLASHLIGHT 30
#define WEAPON_SUIT 31 // ????? #define WEAPON_SUIT 31 // ?????
#define MAX_WEAPONS 32 #define MAX_WEAPONS 32