swars: Allow selecting weapon of a group with keyboard

Author: mefistotelis

src/game.c

@@ -4927,16 +4927,10 @@ ubyte weapon_select_input(void)
     // Double tapping - select for all agents
     if (gameturn - last_sel_weapon_turn[n] < 7)
     {
-        //TODO This doesn't work properly because the flag is not stored in packet
-        // building a packet needs rewriting; for now 0 is written there, which translates to "TOGGLE".
-#if 0
         ubyte flag;
 
         flag = (person_get_selected_weapon(dcthing) == weptype) ? WepSel_SELECT : WepSel_HIDE;
         my_build_packet(&packets[local_player_no], PAct_SELECT_GRP_SPEC_WEAPON, dcthing, weptype, flag, 0);
-#else
-        my_build_packet(&packets[local_player_no], PAct_SELECT_SPECIFIC_WEAPON, dcthing, weptype, WepSel_TOGGLE, 0);
-#endif
         last_sel_weapon_turn[n] -= 7;
     }
     else

src/people.c

@@ -3743,24 +3743,19 @@ ubyte thing_select_specific_weapon(struct Thing *p_person, ushort weptype, ubyte
 
     if (((p_person->U.UPerson.CurrentWeapon == weptype) || (flag == WepSel_HIDE)) && (flag != WepSel_SELECT))
     {
-        if ((p_person->Flag & TngF_PlayerAgent) != 0 && (p_person->Flag2 & TgF2_Unkn0800) == 0) {
-            PlayerInfo *p_player;
-            PlayerIdx plyr;
-            ushort plagent;
-
-            plagent = p_person->U.UPerson.ComCur & 3;
-            plyr = p_person->U.UPerson.ComCur >> 2;
-            p_player = &players[plyr];
-
-            p_player->PrevWeapon[plagent] = p_person->U.UPerson.CurrentWeapon;
+        if ((p_person->Flag & TngF_PlayerAgent) != 0 &&
+          (p_person->Flag2 & TgF2_Unkn0800) == 0 &&
+          p_person->U.UPerson.CurrentWeapon != WEP_NULL) {
+            player_agent_update_prev_weapon(p_person);
         }
         p_person->U.UPerson.CurrentWeapon = WEP_NULL;
-        switch_person_anim_mode(p_person, 0);
     }
     else
     {
-        ubyte animode;
         p_person->U.UPerson.CurrentWeapon = weptype;
+    }
+    {
+        ubyte animode;
         animode = gun_out_anim(p_person, 0);
         switch_person_anim_mode(p_person, animode);
     }

src/plyr_packet.c

@@ -191,7 +191,7 @@ void player_agent_init_drop_item(PlayerIdx plyr, struct Thing *p_person, ushort
 }
 
 void person_grp_switch_to_specific_weapon(struct Thing *p_person, PlayerIdx plyr,
-  ushort weapon, ubyte first_flag)
+  ushort weptype, ubyte first_flag)
 {
     struct Thing *p_owntng;
     ushort plagent;
@@ -201,12 +201,9 @@ void person_grp_switch_to_specific_weapon(struct Thing *p_person, PlayerIdx plyr
     if (p_person->State == PerSt_PROTECT_PERSON)
         p_owntng = &things[p_person->Owner];
 
-    flag = thing_select_specific_weapon(p_person, weapon, first_flag);
+    flag = thing_select_specific_weapon(p_person, weptype, first_flag);
 
     peep_change_weapon(p_person);
-    p_person->U.UPerson.AnimMode = gun_out_anim(p_person, 0);
-    reset_person_frame(p_person);
-    p_person->Speed = calc_person_speed(p_person);
     p_person->U.UPerson.TempWeapon = p_person->U.UPerson.CurrentWeapon;
 
     if ((plyr == local_player_no) && (p_person->U.UPerson.CurrentWeapon != 0))
@@ -224,15 +221,15 @@ void person_grp_switch_to_specific_weapon(struct Thing *p_person, PlayerIdx plyr
         if (p_agent == p_person)
             continue;
 
-        if (((p_agent->U.UPerson.WeaponsCarried & (1 << (weapon - 1))) == 0) || (flag == 1))
+        if (!person_carries_weapon(p_agent, weptype) || (flag == WepSel_HIDE))
         {
             stop_looped_weapon_sample(p_agent, p_agent->U.UPerson.CurrentWeapon);
-            if (flag == 1)
+            if (flag == WepSel_HIDE)
             {
                 player_agent_update_prev_weapon(p_agent);
-                p_agent->U.UPerson.CurrentWeapon = 0;
+                p_agent->U.UPerson.CurrentWeapon = WEP_NULL;
             }
-            else if (p_agent->U.UPerson.TempWeapon != 0)
+            else if (p_agent->U.UPerson.TempWeapon != WEP_NULL)
             {
                 thing_select_specific_weapon(p_agent, p_agent->U.UPerson.TempWeapon, flag);
             }
@@ -244,7 +241,7 @@ void person_grp_switch_to_specific_weapon(struct Thing *p_person, PlayerIdx plyr
         else
         {
             peep_change_weapon(p_agent);
-            thing_select_specific_weapon(p_agent, weapon, flag);
+            thing_select_specific_weapon(p_agent, weptype, flag);
         }
         p_agent->U.UPerson.AnimMode = gun_out_anim(p_agent, 0);
         reset_person_frame(p_agent);
@@ -876,7 +873,7 @@ void process_packet(PlayerIdx plyr, struct Packet *p_pckt, ushort i)
             result = PARes_EINVAL;
             break;
         }
-        if (p_pckt->Y > WepSel_HIDE) {
+        if (p_pckt->Y > WepSel_SKIP) {
             result = PARes_EINVAL;
             break;
         }