Weapon selection quirk with berserk and chainsaw

[plumsinus]

If the player has a berserk pack and a chainsaw, they can toggle between fists and chainsaw. Without the berserk, but with the chainsaw, the chainsaw is the only choice. But Doom Retro saves the last-used weapon of those two and brings it when you press 1.

In this way, a player with berserk, who loses it by exiting the level, can bring up the fists on the next level, but only until the chainsaw is selected, at which point it's back to chainsaw only.

I personally like being able to use the fists at any time, but resetting the state of the 1 weapon on a new level is also viable.

BTW, is the player's punching distance increased in Doom Retro at all? (Directly or by changing the thing radius code.) I felt like I had an easier time punching things than in Chocolate Doom. Could've been my imagination though.

[bradharding]

Thank you for this! I prefer Vanilla DOOM's restriction on fist vs chainsaw selection. Corrected in commit 8f1c6c8.

As for the punching distance: no change made. At least, not intentionally... Having a quick look at A_Punch() and other relevant functions, I can't see anything that would cause this. I'll check it out further.

[plumsinus]

Welcome. Note that, regarding your commit, the player doesn't have to exit with their fists to be able to use them again on the next level, so I'm not sure that fixes the problem - the fists just need to be the choice of weapon on the 1 key. e.g.

IDFA - get all weapons
IDBEHOLDS - get berserk, selecting fists
3 - switch to super shotgun
exit the map
1 - the fists are selected in the new map.

Sorry for not being clearer before.

[bradharding]

No need to apologize! I should have tested more thoroughly. Fixed in commit ae078d5. Incidentally, the code I implemented in commit 8f1c6c8 is still needed. Now, regardless of the weapon the player has selected at the end of a map, if they have a chainsaw, they won't be able to switch to their fists in the next.

[bradharding]

Interesting... Just thought I'd note that the issue I thought you meant and then fixed in commit 8f1c6c8 actually occurs in Vanilla DOOM! Good to fix yet another Vanilla DOOM bug that I didn't know existed!