From daa570c1933228f3bb5b9a3f10487b79c37f473a Mon Sep 17 00:00:00 2001
From: Zack Middleton <zturtleman@gmail.com>
Date: Sun, 18 May 2014 20:27:18 -0500
Subject: [PATCH] Fix always switching back to mgun in Q3 controls menu

Caused by 120e296a74b0317f29d7f516d904bdc70f71b006.
---
 code/q3_ui/ui_controls2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/q3_ui/ui_controls2.c b/code/q3_ui/ui_controls2.c
index 55d33289..f5806a19 100644
--- a/code/q3_ui/ui_controls2.c
+++ b/code/q3_ui/ui_controls2.c
@@ -216,7 +216,7 @@ typedef struct
 	vec3_t				playerMoveangles;
 	int					playerLegs;
 	int					playerTorso;
-	int					playerWeapon;
+	weapon_t			playerWeapon;
 	qboolean			playerChat;
 
 	menubitmap_s		back;
@@ -434,7 +434,7 @@ static void Controls_UpdateModel( int anim ) {
 	s_controls.playerMoveangles[YAW] = s_controls.playerViewangles[YAW];
 	s_controls.playerLegs		     = LEGS_IDLE;
 	s_controls.playerTorso			 = TORSO_STAND;
-	s_controls.playerWeapon			 = -1;
+	s_controls.playerWeapon			 = WP_NUM_WEAPONS;
 	s_controls.playerChat			 = qfalse;
 
 	switch( anim ) {