diff --git a/src/game/inv.h b/src/game/inv.h index bb38ee67a..0d71b765a 100644 --- a/src/game/inv.h +++ b/src/game/inv.h @@ -34,6 +34,7 @@ extern INVENTORY_ITEM InvItemKey1; extern INVENTORY_ITEM InvItemKey2; extern INVENTORY_ITEM InvItemKey3; extern INVENTORY_ITEM InvItemKey4; +extern INVENTORY_ITEM InvItemPistols; extern TEXTSTRING *InvItemText[2]; extern TEXTSTRING *InvRingText; diff --git a/src/game/invvars.c b/src/game/invvars.c index be3d89afb..79c7b2831 100644 --- a/src/game/invvars.c +++ b/src/game/invvars.c @@ -461,3 +461,29 @@ INVENTORY_ITEM InvItemKey4 = { .inv_pos = 104, .sprlist = NULL, }; + +INVENTORY_ITEM InvItemPistols = { + .string = "Pistols", + .object_number = O_GUN_OPTION, + .frames_total = 12, + .current_frame = 0, + .goal_frame = 0, + .open_frame = 11, + .anim_direction = 1, + .anim_speed = 1, + .anim_count = 0, + .pt_xrot_sel = 3200, + .pt_xrot = 0, + .x_rot_sel = -3808, + .x_rot = 0, + .y_rot_sel = 0, + .y_rot = 0, + .ytrans_sel = 0, + .ytrans = 0, + .ztrans_sel = 296, + .ztrans = 0, + .which_meshes = 0xFFFFFFFF, + .drawn_meshes = 0xFFFFFFFF, + .inv_pos = 1, + .sprlist = NULL, +}; diff --git a/src/global/vars.h b/src/global/vars.h index f907234db..b40f9885a 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 InvItemPistols VAR_U_(0x004557A0, INVENTORY_ITEM) #define InvItemShotgun VAR_U_(0x004557E0, INVENTORY_ITEM) #define InvItemMagnum VAR_U_(0x00455820, INVENTORY_ITEM) #define InvItemUzi VAR_U_(0x00455860, INVENTORY_ITEM)