Well, what about the other scenario? I forget to switch to sword and get close to the monster. Now, whatever the game does, is it a warning or automatic switching, I loose a turn (actually automatic switching is worse here, as the monster will have an extra attack, whereas after a warning I can step away). The only solution I can see is having a *very* visible indication of what weapon I'm holding, so I don't make this mistake. Otherwise switching has to be free, which in practice is a separate slot for melee and ranged weapons.