From 73ac4def87360fd68cd4027896e64917fc8f5361 Mon Sep 17 00:00:00 2001
From: Andrey Akhmichin <15944199+nekonomicon@users.noreply.github.com>
Date: Mon, 14 Oct 2024 00:18:16 +0500
Subject: [PATCH] ITEM_FLAG_NOCHOICE->ITEM_FLAG_NOAUTOSWITCHTO.

---
 dlls/rpg.cpp                  | 2 +-
 dlls/singleplay_gamerules.cpp | 2 +-
 dlls/weapons.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/rpg.cpp b/dlls/rpg.cpp
index 4e39ec2c..86ae6d2c 100644
--- 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
index 06ad417c..2dc9336d 100644
--- 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
index 4db8381f..aea4a628 100644
--- 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