From 4deec102daedb767b64a082ffd69cdc89f84f805 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 7 Apr 2018 20:57:09 -0700 Subject: [PATCH] GB Video: Fix bad merge --- src/gb/renderers/software.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gb/renderers/software.c b/src/gb/renderers/software.c index 5b901d235..947662f97 100644 --- a/src/gb/renderers/software.c +++ b/src/gb/renderers/software.c @@ -216,9 +216,6 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i static void GBVideoSoftwareRendererFinishScanline(struct GBVideoRenderer* renderer, int y) { struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer; - if (GBRegisterLCDCIsWindow(softwareRenderer->lcdc) && softwareRenderer->wy <= y && softwareRenderer->wx - 7 < GB_VIDEO_HORIZONTAL_PIXELS) { - ++softwareRenderer->currentWy; - } } static void GBVideoSoftwareRendererFinishFrame(struct GBVideoRenderer* renderer) {