Fixing up some of the problems brought up by the merge.
I think this is probably the best way of hooking the minimap into display. After combat end, hide the NPC combat stuff. As soon as we hit a point where the player can move again (ie, call to mainGameMenu happens), show the map.