Room editing for next update.

Fix some issues with NBQ in software renderer.