Clean up cmd5.c
Clean up and bug fixes in melee2.c (large)

Missing break at original line 640.
Another set of missing () at original line 5645 .
Reordered statements in cave_passable_mon() to reduce overhead for
invalid/impassable grids.  This will need testing to make sure nothing
broke.
Lots of cleanup.