CleverRaven/Cataclysm-DDA — pull request #3316 by CIB (2013-09-28 01:33:00+00:00)
Title: Fixes naming conflict with windows.h

Also fixes a small warning about an unused variable.