CleverRaven/Cataclysm-DDA — pull request #5072 by atomicdryad (2013-12-15 10:57:14+00:00)
Title: Fix terrain.trap (lava, pits, etc) and make it json-order neutral

* Make ter_t.trap neutral via initial assignment to std::string pointer,
after json load iterate through terraub to set from string or warn for invalid assignments prior to game start.
* Reduce code size by use of trapmap via trapfind, remove redundant trap_id_from_string.