Skip to content

Dual wield weapon fire input change #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jbleezy wants to merge 1 commit into
base: development
Choose a base branch
from
+37 −10
Open

Dual wield weapon fire input change #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions components/game_mod/bg_weapons.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,20 @@ int PM_Weapon_WeaponTimeAdjust(pmove_t *pm, pml_t *pml)
bool holdingGrenadeBtn = (weapDef->weapType == WEAPTYPE_GRENADE || weapDef->weapType == WEAPTYPE_MINE) && weapDef->holdButtonToThrow;
bool holdingFireBtn = false;

if (ps->bRunLeftGun)
holdingFireBtn = pm->cmd.button_bits.testBit(0x18) != 0;
if (weapDef->bDualWield && !Dvar_GetString("gpad_enabled"))
{
if (ps->bRunLeftGun)
holdingFireBtn = pm->cmd.button_bits.testBit(0) != 0;
else
holdingFireBtn = pm->cmd.button_bits.testBit(24) != 0;
}
else
holdingFireBtn = pm->cmd.button_bits.testBit(0) != 0;
{
if (ps->bRunLeftGun)
holdingFireBtn = pm->cmd.button_bits.testBit(24) != 0;
else
holdingFireBtn = pm->cmd.button_bits.testBit(0) != 0;
}

if ((*weaponState < WEAPON_OFFHAND_INIT || *weaponState > WEAPON_OFFHAND_END)
&& (pausedAfterFiring || holdingGrenadeBtn)
Expand Down Expand Up @@ -298,16 +308,33 @@ int PM_Weapon_ShouldBeFiring(pmove_t *pm, int delayedAction, bool testOnly)

WeaponDef *weapDef = BG_GetWeaponDef(ps->weapon);
int weaponBit = PM_GetWeaponFireButton(ps->weapon);
bool shouldStartFiring = pm->cmd.button_bits.testBit(weaponBit) != 0;
int dualWieldWeaponBit = 24;
bool shouldStartFiring = false;

// If this is a dw weapon and we're using the offhand
if (ps->bRunLeftGun && weapDef->bDualWield)
if (weapDef->bDualWield)
{
// Check if player holding the fire key
if (pm->cmd.button_bits.testBit(24))
shouldStartFiring = true;
if (!Dvar_GetString("gpad_enabled"))
{
if (ps->bRunLeftGun)
{
shouldStartFiring = pm->cmd.button_bits.testBit(weaponBit);
}
else
{
shouldStartFiring = pm->cmd.button_bits.testBit(dualWieldWeaponBit);
}
}
else
shouldStartFiring = false;
{
if (ps->bRunLeftGun)
{
shouldStartFiring = pm->cmd.button_bits.testBit(dualWieldWeaponBit);
}
else
{
shouldStartFiring = pm->cmd.button_bits.testBit(weaponBit);
}
}
}

if (weapDef->freezeMovementWhenFiring && ps->groundEntityNum == 1023)
Expand Down