about summary refs log tree commit diff
path: root/src/game/client/gc_hooks.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/client/gc_hooks.cpp')
-rw-r--r--src/game/client/gc_hooks.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
index d3feb871..601575f3 100644
--- a/src/game/client/gc_hooks.cpp
+++ b/src/game/client/gc_hooks.cpp
@@ -608,7 +608,8 @@ extern "C" void modc_message(int msgtype)
     else if(msgtype == NETMSGTYPE_SV_WEAPON_PICKUP)
     {
     	NETMSG_SV_WEAPON_PICKUP *msg = (NETMSG_SV_WEAPON_PICKUP *)rawmsg;
-        picked_up_weapon = msg->weapon+1;
+        if(config.cl_autoswitch_weapons)
+        	input_data.wanted_weapon = msg->weapon+1;
     }
 	else if(msgtype == NETMSGTYPE_SV_READY_TO_ENTER)
 	{