chocolate-doom: bring inline with the changes to the -git version

See the previous commit for rationale.