ref: 964507f8014938dcae18d42b605c058edf906799
parent: 8237514e5f550a161f8ba243bd1515a4415a1c3a
author: Michael Day <[email protected]>
date: Thu Apr 21 05:11:53 EDT 2022
Hexen: Add inventory move helper functions Co-authored-by: kraflab <[email protected]>
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -744,6 +744,59 @@
}
}
+static boolean InventoryMoveLeft()
+{+ inventoryTics = 5 * 35;
+ if (!inventory)
+ {+ inventory = true;
+ return false;
+ }
+ inv_ptr--;
+ if (inv_ptr < 0)
+ {+ inv_ptr = 0;
+ }
+ else
+ {+ curpos--;
+ if (curpos < 0)
+ {+ curpos = 0;
+ }
+ }
+ return true;
+}
+
+static boolean InventoryMoveRight()
+{+ player_t *plr;
+
+ plr = &players[consoleplayer];
+ inventoryTics = 5 * 35;
+ if (!inventory)
+ {+ inventory = true;
+ return false;
+ }
+ inv_ptr++;
+ if (inv_ptr >= plr->inventorySlotNum)
+ {+ inv_ptr--;
+ if (inv_ptr < 0)
+ inv_ptr = 0;
+ }
+ else
+ {+ curpos++;
+ if (curpos > 6)
+ {+ curpos = 6;
+ }
+ }
+ return true;
+}
+
static void SetMouseButtons(unsigned int buttons_mask)
{int i;
@@ -847,51 +900,19 @@
case ev_keydown:
if (ev->data1 == key_invleft)
{- inventoryTics = 5 * 35;
- if (!inventory)
+ if (InventoryMoveLeft())
{- inventory = true;
- break;
+ return (true);
}
- inv_ptr--;
- if (inv_ptr < 0)
- {- inv_ptr = 0;
- }
- else
- {- curpos--;
- if (curpos < 0)
- {- curpos = 0;
- }
- }
- return (true);
+ break;
}
if (ev->data1 == key_invright)
{- inventoryTics = 5 * 35;
- if (!inventory)
+ if (InventoryMoveRight())
{- inventory = true;
- break;
+ return (true);
}
- inv_ptr++;
- if (inv_ptr >= plr->inventorySlotNum)
- {- inv_ptr--;
- if (inv_ptr < 0)
- inv_ptr = 0;
- }
- else
- {- curpos++;
- if (curpos > 6)
- {- curpos = 6;
- }
- }
- return (true);
+ break;
}
if (ev->data1 == key_pause && !MenuActive)
{