FIX: outer top and right edge would not be cleared

The room is now completely cleared.
Invert if for conciseness
Combine separate clear maps into one method

Combining two slightly different clearmap methods into one.