Revert "- Duke: Restore a little bit of original code to make comparisons between us and the source easier."

This reverts commit 7607190dad.

* Not good in hindsight... We need the actual value from the backend to ensure we can match up against `WeaponSel_Next`/`WeaponSel_Prev`/`WeaponSel_Alt` as required.
This commit is contained in:
Mitchell Richters 2021-07-17 22:42:58 +10:00
parent 4ee93de36c
commit bcff74f5e4
4 changed files with 5 additions and 5 deletions

View file

@ -136,7 +136,7 @@ inline void PlayerSetInput(int pl, ESyncBits bit)
inline int PlayerNewWeapon(int pl)
{
return ps[pl].sync.getNewWeapon() - 1;
return ps[pl].sync.getNewWeapon();
}
inline void PlayerSetItemUsed(int pl, int num)

View file

@ -243,8 +243,8 @@ void hud_input(int plnum)
}
int weap = PlayerNewWeapon(plnum);
if (weap > 0 && p->kickback_pic > 0)
p->wantweaponfire = weap;
if (weap > 1 && p->kickback_pic > 0)
p->wantweaponfire = weap - 1;
// Here we have to be extra careful that the weapons do not get mixed up, so let's keep the code for Duke and RR completely separate.
fi.selectweapon(plnum, weap);

View file

@ -1299,7 +1299,7 @@ void selectweapon_d(int snum, int weap) // playernum, weaponnum
}
}
}
else j = weap;
else j = weap - 1;
k = -1;

View file

@ -1071,7 +1071,7 @@ void selectweapon_r(int snum, int weap)
}
}
}
else j = weap;
else j = weap - 1;
k = -1;