From 889698c22bc289ea180429a2cb15500a223511ec Mon Sep 17 00:00:00 2001
From: rr- <dash@wind.garden>
Date: Sun, 31 Oct 2021 20:49:14 +0100
Subject: [PATCH] vars: pull InvItemShotgun

---
 src/game/inv.h     |  1 +
 src/game/invvars.c | 26 ++++++++++++++++++++++++++
 src/global/vars.h  |  1 -
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/game/inv.h b/src/game/inv.h
index 0d71b765a..d1eae47c2 100644
--- a/src/game/inv.h
+++ b/src/game/inv.h
@@ -35,6 +35,7 @@ extern INVENTORY_ITEM InvItemKey2;
 extern INVENTORY_ITEM InvItemKey3;
 extern INVENTORY_ITEM InvItemKey4;
 extern INVENTORY_ITEM InvItemPistols;
+extern INVENTORY_ITEM InvItemShotgun;
 
 extern TEXTSTRING *InvItemText[2];
 extern TEXTSTRING *InvRingText;
diff --git a/src/game/invvars.c b/src/game/invvars.c
index 79c7b2831..3d80ba7fe 100644
--- a/src/game/invvars.c
+++ b/src/game/invvars.c
@@ -487,3 +487,29 @@ INVENTORY_ITEM InvItemPistols = {
     .inv_pos = 1,
     .sprlist = NULL,
 };
+
+INVENTORY_ITEM InvItemShotgun = {
+    .string = "Shotgun",
+    .object_number = O_SHOTGUN_OPTION,
+    .frames_total = 13,
+    .current_frame = 0,
+    .goal_frame = 0,
+    .open_frame = 12,
+    .anim_direction = 1,
+    .anim_speed = 1,
+    .anim_count = 0,
+    .pt_xrot_sel = 3200,
+    .pt_xrot = 0,
+    .x_rot_sel = 0,
+    .x_rot = 0,
+    .y_rot_sel = -8192,
+    .y_rot = 0,
+    .ytrans_sel = 0,
+    .ytrans = 0,
+    .ztrans_sel = 296,
+    .ztrans = 0,
+    .which_meshes = 0xFFFFFFFF,
+    .drawn_meshes = 0xFFFFFFFF,
+    .inv_pos = 2,
+    .sprlist = NULL,
+};
diff --git a/src/global/vars.h b/src/global/vars.h
index b40f9885a..5a519b93a 100644
--- a/src/global/vars.h
+++ b/src/global/vars.h
@@ -118,7 +118,6 @@ extern int32_t KeyChange;
 #define CompassNeedle           VAR_U_(0x0045A0AC, int16_t)
 #define Item_Data               VAR_U_(0x0045A0B8, int16_t)
 
-#define InvItemShotgun          VAR_U_(0x004557E0, INVENTORY_ITEM)
 #define InvItemMagnum           VAR_U_(0x00455820, INVENTORY_ITEM)
 #define InvItemUzi              VAR_U_(0x00455860, INVENTORY_ITEM)
 #define InvItemGrenade          VAR_U_(0x004559A0, INVENTORY_ITEM)