Refactor and fix blocking with martial arts.
Fall back to -1 instead like no_style, and use that rather than 0.
Stop absorbing scent from closed doors.  This creates a loop that will
increase smell infinitely on the opposite side of a door.  Ironically, a
player in the room resets their square to their own smell and prevents the
infinite loop.  But anyway.  This is bad.  We will now correctly ignore
closed doors and therefore calculate squares_used accurately.  Note: Smell
still lingers forever, it just doesn't increase.
ifndef guards to allow compilation when a header file also defines these
variables (as the newest MinGW header files do).
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Refactor and fix blocking with martial arts.

Conflicts:
	src/melee.cpp
Fall back to -1 instead like no_style, and use that rather than 0.
Merge branch 'merge-MA-changes' into ma-block-fix

Conflicts:
	src/melee.cpp
Merge martial art block fixes and door scent fixes.