inventory: set any weapon to default on pickup if unarmed

Resolves LostArtefacts#1443.

CHANGELOG.md

@@ -16,6 +16,7 @@
 - fixed carrying over unexpected guns in holsters to the next level under rare scenarios (#1437, regression from 2.4)
 - fixed item cheats not updating Lara holster and backpack meshes (#1437)
 - improved initial level load time by lazy-loading audio samples (LostArtefacts/TR2X#114)
+- set Lara's default weapon to any weapon she picks up when unarmed, not just pistols (#1443)
 
 ## [4.2](https://github.com/LostArtefacts/TR1X/compare/4.1.2...4.2) - 2024-07-14
 - added creating minidump files on crashes

README.md

@@ -515,6 +515,7 @@ Not all options are turned on by default. Refer to `TR1X_ConfigTool.exe` for det
 - fixed looking forward too far causing an upside down camera frame
 - fixed the Scion being extremely difficult to shoot with the shotgun
 - fixed collision issues with drawbridges, trapdoors, and bridges when stacked over each other, over slopes, and near the ground
+- set Lara's default weapon to any weapon she picks up when unarmed, not just pistols
 
 #### Cheats
 - added a fly cheat

src/game/gun.h

@@ -15,6 +15,7 @@ void Gun_HitTarget(ITEM_INFO *item, GAME_VECTOR *hitpos, int16_t damage);
 void Gun_DrawFlash(LARA_GUN_TYPE weapon_type, int32_t clip);
 GAME_OBJECT_ID Gun_GetLaraAnim(LARA_GUN_TYPE gun_type);
 GAME_OBJECT_ID Gun_GetWeaponAnim(LARA_GUN_TYPE gun_type);
+LARA_GUN_TYPE Gun_GetType(GAME_OBJECT_ID object_id);
 void Gun_UpdateLaraMeshes(GAME_OBJECT_ID object_id);
 void Gun_SetLaraBackMesh(LARA_GUN_TYPE weapon_type);
 void Gun_SetLaraHandLMesh(LARA_GUN_TYPE weapon_type);

src/game/gun/gun.c

@@ -234,6 +234,22 @@ GAME_OBJECT_ID Gun_GetWeaponAnim(const LARA_GUN_TYPE gun_type)
     }
 }
 
+LARA_GUN_TYPE Gun_GetType(const GAME_OBJECT_ID object_id)
+{
+    switch (object_id) {
+    case O_PISTOL_ITEM:
+        return LGT_PISTOLS;
+    case O_MAGNUM_ITEM:
+        return LGT_MAGNUMS;
+    case O_UZI_ITEM:
+        return LGT_UZIS;
+    case O_SHOTGUN_ITEM:
+        return LGT_SHOTGUN;
+    default:
+        return LGT_UNARMED;
+    }
+}
+
 void Gun_DrawFlash(LARA_GUN_TYPE weapon_type, int32_t clip)
 {
     int32_t light;

src/game/inventory/inventory_func.c

@@ -14,6 +14,11 @@ bool Inv_AddItem(const GAME_OBJECT_ID object_id)
 {
     if (Object_IsObjectType(object_id, g_GunObjects)) {
         Gun_UpdateLaraMeshes(object_id);
+        if (g_Lara.gun_type == LGT_UNARMED) {
+            g_Lara.gun_type = Gun_GetType(object_id);
+            g_Lara.gun_status = LGS_ARMLESS;
+            Gun_InitialiseNewWeapon();
+        }
     }
 
     const GAME_OBJECT_ID inv_object_id = Inv_GetItemOption(object_id);