Fix normal guns in melee slot

[Kurtsley]

Addresses #781.

This should prevent guns being added to the melee slot. Should an error sound be played as well?

[cxong]

I see, this is a slightly tricky bug I think I would prefer the following:

• If the player is holding a melee weapon (a->gunIndex == MELEE_SLOT) and tries to pick up a normal gun, switch to the first gun (a->gunIndex == 0) and proceed with the normal logic (i.e. logic described here https://github.com/cxong/cdogs-sdl/blob/master/src/cdogs/pickup.c#L345-L351)
• Likewise, if the player is holding a normal gun and tries to pick up a melee weapon, switch to the melee weapon and then pickup

[Kurtsley]

This appears to accomplish what you wanted the game to do. The only thing I wasn't able to test was picking up a different melee weapon while holding a melee weapon.

[Kurtsley]

Okay, this is what I have now:

• If holding a gun and pick up melee, switch to melee and continue the logic.
• If holding a melee weapon and pick up a gun, switch to the first weapon slot and continue the logic.
• If holding a grenade and pick up a gun, switch to the first weapon slot and continue the logic.
• If holding a grenade and pick up a melee weapon, switch to melee and continue the logic.

Anything else that happens should be the same as before.

I tested this as many ways I could think of, including with and without the grenade slot. Hopefully this works correctly now, but I could be missing an edge case. This was more complicated than I originally thought.

[cxong]

I'll take a look at this myself later, and considering how complex this turned out to be, I think it's worth refactoring this logic to the Actor class and covering with unit tests.

[Kurtsley]

I was looking at possibly adding it to the ActorReplaceGun function in the actors.c file. Either that or put it in a separate bool function , whatever works best. As for the unit tests, that is not a strength of m

[Kurtsley]

Accidentally closed. To continue, I would give the tests a shot.