# HG changeset patch # User Matti Hamalainen # Date 1560353146 -10800 # Node ID 560ba06a99ebf81bb7d8c5c01697a6e97e3a9d1e # Parent 33cf1b330b7b5f45f8b7e421a8bfe3c255b01bf1 Oops, forgot these from previous commit. diff -r 33cf1b330b7b -r 560ba06a99eb tools/gfxconv.c --- a/tools/gfxconv.c Wed Jun 12 18:22:04 2019 +0300 +++ b/tools/gfxconv.c Wed Jun 12 18:25:46 2019 +0300 @@ -1238,14 +1238,14 @@ dst->d024 = src->d024; // Try to do some simple fixups - if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_MC && - (src->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES) + if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC && + (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES) { dmC64MemBlockCopy(&dst->screen[0], &src->screen[0]); } else - if ((dst->fmt->type & D64_FMT_MASK) == D64_FMT_HIRES && - (src->fmt->type & D64_FMT_MASK) == D64_FMT_MC) + if ((dst->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_HIRES && + (src->fmt->type & D64_FMT_MODE_MASK) == D64_FMT_MC) { // XXX TODO: Handle FLI mc->hires differently? }