added support for non-rectangular room. fixed mansion 1f, room3