GB Video: Fix bad merge
Vicki Pfau vi@endrift.com
Sat, 07 Apr 2018 20:57:09 -0700
1 files changed,
0 insertions(+),
3 deletions(-)
jump to
M
src/gb/renderers/software.c
→
src/gb/renderers/software.c
@@ -216,9 +216,6 @@ }
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) {