Fix issue with lines hidden by barrels being treated as free space

[oswinso]

~~Depends on #383.~~

Currently, when lines are hidden as barrels, the mapper will think that there aren't any lines, and thus mark them as empty space.

Depends on #536

AC: line_layer doesn't mark places that are blocked by a barrel as occupied.