Fixing bug with melee weapons

Melee weapons are now properly registered and unregistered with maps
when you warp.

Changed the equipWeapon method - removed the map argument.

Deleted the swapWeapon method.