Ticket #47: instantWeaponSwitch.patch

code/cgame/cg_consolecmds.c

@@ -833 +833 @@
         { "node_savefile", CG_SaveFileAiNode_f},
         { "node_openfile", CG_OpenFileAiNode_f},
         { "wq_buy", CG_BuyMenu },
+        { "instaswap", CG_InstaSwap },
 #endif
         { "startOrbit", CG_StartOrbit_f },
         //{ "camera", CG_Camera_f },

code/cgame/cg_local.h

@@ -2116 +2116 @@
 void CG_DrawWeaponSelect( void );
 
 void CG_OutOfAmmoChange( void );        // should this be in pmove?
+void CG_InstaSwap ( void );
 
 //
 // cg_marks.c

code/cgame/cg_weapons.c

@@ -4374 +4374 @@
         VectorCopy(start, re->origin);
         re->origin[2] += 2 ;
 }
+
+void CG_InstaSwap(){
+        playerState_t *ps = &cg.predictedPlayerState;
+        char weapon[MAX_STRING_TOKENS];
+        trap_Argv( 1, weapon , sizeof( weapon ) );
+        
+        if (!Q_stricmp(weapon,"knife")){
+                cg.weaponSelect=WP_KNIFE;
+        } else if (!Q_stricmp(weapon,"pistol1")){
+                int pistol;
+                if (pistol=BG_SearchTypeWeapon(WPS_PISTOL,ps->stats[STAT_WEAPONS],0)){
+                        cg.weaponSelect=pistol;
+                        
+                }
+        } else if (!Q_stricmp(weapon,"pistol2")){
+                int pistol;
+                if (pistol=BG_SearchTypeWeapon(WPS_PISTOL,ps->stats[STAT_WEAPONS],BG_SearchTypeWeapon(WPS_PISTOL,ps->stats[STAT_WEAPONS],0))){
+                        //Something tells me there should be a better way to do this.
+                        cg.weaponSelect=pistol;
+                        
+                }
+        } else if (!Q_stricmp(weapon,"akimbo")){
+                cg.weaponSelect=WP_AKIMBO;
+        } else if (!Q_stricmp(weapon,"longgun")){
+                int longgun;
+                if (longgun=BG_SearchTypeWeapon(WPS_GUN,ps->stats[STAT_WEAPONS],0)){
+                        cg.weaponSelect=longgun;
+                }
+        } else if (!Q_stricmp(weapon,"dynamite")){
+                cg.weaponSelect=WP_DYNAMITE;
+        } else if (!Q_stricmp(weapon,"molotov")){
+                cg.weaponSelect=WP_MOLOTOV;
+        } else {
+                CG_Printf("Unrecognized weapon: %s",weapon);
+        }
+}
+
 #endif