Add solid and hybrid wall options
Tidy up solid/hybrid wall options
Clean up the logic for hybrid and solid walls
Fix indentation
Fix up compiler warning
Fix lighting logic in cave.c
Merge Nick's background colour changes with fixes