Fix 1996770: shafts being capable of disarming.

Fix 1996304: the Swap card incorrectly swapping monsters/player caught in a net

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5941 c06c8d41-db1a-0410-9941-cceddc491573

Created by  j-p-e-g  on June 18, 2008
HAMUM5IA4BJMLRIME7KVVVYLRHVS55RIYMGLLQZL3F7QEP7FJ5KAC
Change contents