FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ITEM_FLAG_NOCHOICE->ITEM_FLAG_NOAUTOSWITCHTO.

This commit is contained in:
Andrey Akhmichin 2024-10-14 00:18:16 +05:00
parent 5bb2762190
commit 73ac4def87
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/rpg.cpp
View File

@ -400,7 +400,7 @@ int CRpg::GetItemInfo( ItemInfo *p )
p->iSlot = 3; p->iSlot = 3;
p->iPosition = 0; p->iPosition = 0;
p->iId = m_iId = WEAPON_RPG; p->iId = m_iId = WEAPON_RPG;
p->iFlags = ITEM_FLAG_NOCHOICE; p->iFlags = ITEM_FLAG_NOAUTOSWITCHTO;
p->iWeight = RPG_WEIGHT; p->iWeight = RPG_WEIGHT;
return 1; return 1;

2
dlls/singleplay_gamerules.cpp
View File

@ -119,7 +119,7 @@ BOOL HLGetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
while( pCheck ) while( pCheck )
{ {
if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOCHOICE )) if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOAUTOSWITCHTO ))
{ {
if( pCheck->iWeight() > -1 && pCheck->iWeight() == pCurrentWeapon->iWeight() && pCheck != pCurrentWeapon ) if( pCheck->iWeight() > -1 && pCheck->iWeight() == pCurrentWeapon->iWeight() && pCheck != pCurrentWeapon )
{ {

2
dlls/weapons.h
View File

@ -183,7 +183,7 @@ typedef enum
#define ITEM_FLAG_NOAUTOSWITCHEMPTY 4 #define ITEM_FLAG_NOAUTOSWITCHEMPTY 4
#define ITEM_FLAG_LIMITINWORLD 8 #define ITEM_FLAG_LIMITINWORLD 8
#define ITEM_FLAG_EXHAUSTIBLE 16 // A player can totally exhaust their ammo supply and lose this weapon #define ITEM_FLAG_EXHAUSTIBLE 16 // A player can totally exhaust their ammo supply and lose this weapon
#define ITEM_FLAG_NOCHOICE 32 #define ITEM_FLAG_NOAUTOSWITCHTO 32
#define WEAPON_IS_ONTARGET 0x40 #define WEAPON_IS_ONTARGET 0x40