When the player gets the ROE artifact (BloodStone) override the ui_au…

…toSwitch cvar (ref #138)
MadDeCoDeR · Nov 26, 2023 · 381cea4 · 381cea4
1 parent f48a13d
commit 381cea4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/neo/d3xp/Player.cpp b/neo/d3xp/Player.cpp
@@ -1046,7 +1046,7 @@ bool idInventory::Give( idPlayer* owner, const idDict& spawnArgs, const char* st
 					{
 						idLobbyBase& lobby = session->GetActingGameStateLobbyBase();
 						lobbyUserID_t& lobbyUserID = gameLocal->lobbyUserIDs[owner->entityNumber];
-						if( lobby.GetLobbyUserWeaponAutoSwitch( lobbyUserID ) && idealWeapon != NULL && i != owner->weapon_bloodstone_active1 && i != owner->weapon_bloodstone_active2 && i != owner->weapon_bloodstone_active3 )
+						if( i == owner->weapon_bloodstone ||( lobby.GetLobbyUserWeaponAutoSwitch( lobbyUserID ) && idealWeapon != NULL && i != owner->weapon_bloodstone_active1 && i != owner->weapon_bloodstone_active2 && i != owner->weapon_bloodstone_active3 ))
 						{
 							idealWeapon->Set( i );
 						}