Merge pull request #232 from hwoarangmy/development

Trap/Room creation in a more objet way (avoiding void* pointers)