ITEM_FLAG_NOCHOICE->ITEM_FLAG_NOAUTOSWITCHTO.

nekonomicon · nekonomicon · commit 73ac4def8736 · 2024-10-14T00:18:16.000+05:00
diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
@@ -400,7 +400,7 @@ int CRpg::GetItemInfo( ItemInfo *p )
 	p->iSlot = 3;
 	p->iPosition = 0;
 	p->iId = m_iId = WEAPON_RPG;
-	p->iFlags = ITEM_FLAG_NOCHOICE;
+	p->iFlags = ITEM_FLAG_NOAUTOSWITCHTO;
 	p->iWeight = RPG_WEIGHT;
 
 	return 1;
diff --git a/dlls/singleplay_gamerules.cpp b/dlls/singleplay_gamerules.cpp
@@ -119,7 +119,7 @@ BOOL HLGetNextBestWeapon(CBasePlayer *pPlayer, CBasePlayerItem *pCurrentWeapon )
 
 		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 )
 				{
diff --git a/dlls/weapons.h b/dlls/weapons.h
@@ -183,7 +183,7 @@ typedef	enum
 #define ITEM_FLAG_NOAUTOSWITCHEMPTY	4
 #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_NOCHOICE		32
+#define ITEM_FLAG_NOAUTOSWITCHTO	32
 
 #define WEAPON_IS_ONTARGET 0x40
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ BOOL HLGetNextBestWeapon(CBasePlayer pPlayer, CBasePlayerItem pCurrentWeapon )`
`119`	`119`
`120`	`120`	`while( pCheck )`
`121`	`121`	`{`
`122`		`- if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOCHOICE ))`
	`122`	`+ if( !FBitSet( pCheck->iFlags(), ITEM_FLAG_NOAUTOSWITCHTO ))`
`123`	`123`	`{`
`124`	`124`	`if( pCheck->iWeight() > -1 && pCheck->iWeight() == pCurrentWeapon->iWeight() && pCheck != pCurrentWeapon )`
`125`	`125`	`{`