swars: Introduced WeaponType typedef

Author: mefistotelis

src/enginzoom.c

@@ -122,7 +122,7 @@ ushort get_unscaled_zoom(ushort szoom)
         return  240 * szoom / h;
 }
 
-int get_weapon_zoom_min(ushort wtype)
+int get_weapon_zoom_min(WeaponType wtype)
 {
     struct WeaponDef *wdef;
     int zoom;

src/enginzoom.h

@@ -22,6 +22,8 @@
 #include "bftypes.h"
 #include "poly.h"
 
+#include "game_bstype.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -58,7 +60,7 @@ void zoom_update(short zoom_min, short zoom_max);
 
 ushort get_scaled_zoom(ushort zoom);
 ushort get_unscaled_zoom(ushort szoom);
-int get_weapon_zoom_min(ushort wtype);
+int get_weapon_zoom_min(WeaponType wtype);
 
 short get_overall_scale_min(void);
 short get_overall_scale_max(void);

src/fedebrief.c

@@ -179,7 +179,7 @@ void draw_mission_stats_vals_static(struct ScreenBox *box,
 
 void snprint_concat_comma_separated_weapons_list(char *out, ushort outlen, ulong weapons)
 {
-    ushort wtype;
+    WeaponType wtype;
     ushort strid;
     ushort pos;
 
@@ -189,7 +189,7 @@ void snprint_concat_comma_separated_weapons_list(char *out, ushort outlen, ulong
         struct Campaign *p_campgn;
 
         wtype = weapons_prev_weapon(weapons, wtype);
-        if (wtype == 0)
+        if (wtype == WEP_NULL)
             break;
 
         if (strlen(out) > outlen - 4u)

src/feequip.c

@@ -1131,16 +1131,16 @@ void draw_fourpack_slots(short x, short y, ubyte fp)
     draw_box_purple_list(x + 150, y + 30, 4u, 4u, 174);
 }
 
-void show_weapon_slot(short scr_x, short scr_y, short weptype)
+void show_weapon_slot(short scr_x, short scr_y, WeaponType wtype)
 {
     ushort fp;
 
     lbDisplay.DrawColour = 174;
     lbDisplay.DrawFlags = 0x8000 | Lb_TEXT_ONE_COLOR;
-    draw_sprite_purple_list(scr_x, scr_y, &unk1_sprites[weptype - 1 + 1]);
+    draw_sprite_purple_list(scr_x, scr_y, &unk1_sprites[wtype - 1 + 1]);
     lbDisplay.DrawFlags &= ~0x8000;
 
-    fp = weapon_fourpack_index(weptype);
+    fp = weapon_fourpack_index(wtype);
     if (fp < WFRPK_COUNT) {
         draw_fourpack_slots(scr_x, scr_y, fp);
     }
@@ -1151,7 +1151,7 @@ void show_weapon_slot(short scr_x, short scr_y, short weptype)
         if (mouse_down_over_box_coords(scr_x, scr_y, scr_x + 181, scr_y + 42))
         {
             lbDisplay.LeftButton = 0;
-            mo_weapon = weptype - 1;
+            mo_weapon = (int)wtype - 1;
             mo_from_agent = selected_agent;
         }
     }
@@ -1160,11 +1160,11 @@ void show_weapon_slot(short scr_x, short scr_y, short weptype)
     {
         if (mouse_move_over_box_coords(scr_x, scr_y, scr_x + 181, scr_y + 42))
         {
-            selected_weapon = weptype - 1;
+            selected_weapon = (int)wtype - 1;
             switch_equip_offer_to_sell();
             equip_update_for_selected_weapon();
         }
-        if (weptype - 1 >= mo_weapon) {
+        if ((int)wtype - 1 >= mo_weapon) {
             mo_weapon = -1;
         }
     }
@@ -1180,7 +1180,7 @@ ubyte show_weapon_slots(struct ScreenBox *p_box)
 #endif
     short scr_x, scr_y;
     short slot;
-    short weptype;
+    WeaponType wtype;
 
     scr_x = p_box->X + 5;
     if ((p_box->Flags & GBxFlg_TextCopied) == 0)
@@ -1202,7 +1202,7 @@ ubyte show_weapon_slots(struct ScreenBox *p_box)
 
     scr_y = p_box->Y + 5;
     slot = 0;
-    for (weptype = 1; weptype < WEP_TYPES_COUNT; weptype++)
+    for (wtype = WEP_NULL + 1; wtype < WEP_TYPES_COUNT; wtype++)
     {
         TbBool has_weapon;
 
@@ -1211,19 +1211,19 @@ ubyte show_weapon_slots(struct ScreenBox *p_box)
 
         if (selected_agent == 4)
         {
-          has_weapon = player_agent_has_weapon(local_player_no, 0, weptype)
-            && player_agent_has_weapon(local_player_no, 1, weptype)
-            && player_agent_has_weapon(local_player_no, 2, weptype)
-            && player_agent_has_weapon(local_player_no, 3, weptype);
+          has_weapon = player_agent_has_weapon(local_player_no, 0, wtype)
+            && player_agent_has_weapon(local_player_no, 1, wtype)
+            && player_agent_has_weapon(local_player_no, 2, wtype)
+            && player_agent_has_weapon(local_player_no, 3, wtype);
         }
         else
         {
-          has_weapon = player_agent_has_weapon(local_player_no, selected_agent, weptype);
+          has_weapon = player_agent_has_weapon(local_player_no, selected_agent, wtype);
         }
 
         if (has_weapon)
         {
-            show_weapon_slot(scr_x, scr_y, weptype);
+            show_weapon_slot(scr_x, scr_y, wtype);
             slot++;
             scr_y += 44;
         }

src/game.c

@@ -2095,7 +2095,7 @@ void teleport_current_agent(PlayerInfo *p_locplayer)
 
 void person_give_all_weapons(struct Thing *p_person)
 {
-    ushort wtype;
+    WeaponType wtype;
 
     for (wtype = WEP_TYPES_COUNT-1; wtype > 0; wtype--)
     {
@@ -2115,7 +2115,7 @@ void person_give_all_weapons(struct Thing *p_person)
 
 void mark_all_weapons_researched(void)
 {
-    ushort wtype;
+    WeaponType wtype;
 
     for (wtype = WEP_TYPES_COUNT-1; wtype > 0; wtype--)
     {
@@ -4880,7 +4880,7 @@ ubyte weapon_select_input(void)
 #endif
     PlayerInfo *p_locplayer;
     ThingIdx dcthing;
-    ushort weptype;
+    WeaponType wtype;
     int n;
 
 #ifdef MORE_GAME_KEYS
@@ -4897,7 +4897,7 @@ ubyte weapon_select_input(void)
 
     p_locplayer = &players[local_player_no];
     dcthing = p_locplayer->DirectControl[0];
-    weptype = WEP_NULL;
+    wtype = WEP_NULL;
 
 
     assert(sizeof(sel_weapon_keys)/sizeof(sel_weapon_keys[0]) <= WEAPONS_CARRIED_MAX_COUNT);
@@ -4915,27 +4915,27 @@ ubyte weapon_select_input(void)
         {
             clear_key_pressed(kkey);
 #endif
-            weptype = find_nth_weapon_held(dcthing, n+1);
-            if (weptype != WEP_NULL)
+            wtype = find_nth_weapon_held(dcthing, n+1);
+            if (wtype != WEP_NULL)
                 break;
         }
     }
 
-    if (weptype == WEP_NULL)
+    if (wtype == WEP_NULL)
         return 0;
 
     // Double tapping - select for all agents
     if (gameturn - last_sel_weapon_turn[n] < 7)
     {
         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);
+        flag = (person_get_selected_weapon(dcthing) == wtype) ? WepSel_SELECT : WepSel_HIDE;
+        my_build_packet(&packets[local_player_no], PAct_SELECT_GRP_SPEC_WEAPON, dcthing, wtype, flag, 0);
         last_sel_weapon_turn[n] -= 7;
     }
     else
     {
-        my_build_packet(&packets[local_player_no], PAct_SELECT_SPECIFIC_WEAPON, dcthing, weptype, WepSel_TOGGLE, 0);
+        my_build_packet(&packets[local_player_no], PAct_SELECT_SPECIFIC_WEAPON, dcthing, wtype, WepSel_TOGGLE, 0);
         last_sel_weapon_turn[n] = gameturn;
     }
 

src/game_bstype.h

@@ -44,6 +44,10 @@ typedef short ThingIdx;
  */
 typedef ubyte PlayerIdx;
 
+/** Type which stores type of a weapon.
+ */
+typedef ubyte WeaponType;
+
 /** Coordinate on the screen surface.
  * The type shall allow safety store values beyond (below/above) real screen
  * coordinates, up to another screen size. This means it needs to allow to