Batch modification to #7887, #7890 by csnover: component to Engine: SCUMM -- Tickets URL: <https://bugs.scummvm.org/query?id=7887%2C7890> ScummVM <https://bugs.scummvm.org> ScummVM