moved end_room straight option to own function