diff options
| author | aliaspider | 2015-11-13 21:45:49 +0100 |
|---|---|---|
| committer | aliaspider | 2015-11-13 21:45:49 +0100 |
| commit | ae20abebdb7b36ca14cd59392adef0a5074ce45f (patch) | |
| tree | 9cc16f8ee45cb69d96c7f2df8dc8f0391982a3c4 | |
| parent | e7e3bce1282f17c33170d513c7bda470bfddb9d5 (diff) | |
| download | snes9x2002-ae20abebdb7b36ca14cd59392adef0a5074ce45f.tar.gz snes9x2002-ae20abebdb7b36ca14cd59392adef0a5074ce45f.tar.bz2 snes9x2002-ae20abebdb7b36ca14cd59392adef0a5074ce45f.zip | |
buildfix for __OLD_RASTER_FX__
| -rw-r--r-- | src/gfx16.c | 15 | ||||
| -rw-r--r-- | src/ppu_setppu.h | 6 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/gfx16.c b/src/gfx16.c index 7480a9b..524ef08 100644 --- a/src/gfx16.c +++ b/src/gfx16.c @@ -3241,11 +3241,8 @@ else \ IPPU.PreviousLine = IPPU.CurrentLine; } -#ifdef __OLD_RASTER_FX__ -static void S9xUpdateScreen_delayedRasterFx() // ~30-50ms! (called from FLUSH_REDRAW()) -#else +#ifndef __OLD_RASTER_FX__ void S9xUpdateScreen() // ~30-50ms! (called from FLUSH_REDRAW()) -#endif { int StartY, EndY, CurrentLine, CurrentROp; @@ -3340,9 +3337,9 @@ void S9xUpdateScreen() // ~30-50ms! (called from FLUSH_REDRAW()) PPU.BG[3].OffsetsChanged = 0; } -#ifdef __OLD_RASTER_FX__ +#else // __OLD_RASTER_FX__ -static void S9xUpdateScreen_normalRasterFx() // ~30-50ms! (called from FLUSH_REDRAW()) +void S9xUpdateScreen() // ~30-50ms! (called from FLUSH_REDRAW()) { GFX.StartY = IPPU.PreviousLine; if ((GFX.EndY = IPPU.CurrentLine - 1) >= PPU.ScreenHeight) GFX.EndY = PPU.ScreenHeight - 1; @@ -3396,12 +3393,6 @@ static void S9xUpdateScreen_normalRasterFx() // ~30-50ms! (called from FLUSH_RE PPU.BG[2].OffsetsChanged = 0; PPU.BG[3].OffsetsChanged = 0; } - -void S9xUpdateScreen() -{ - if (snesMenuOptions.delayedRasterFX) S9xUpdateScreen_delayedRasterFx(); - else S9xUpdateScreen_normalRasterFx(); -} #endif // -x- diff --git a/src/ppu_setppu.h b/src/ppu_setppu.h index 71fb92e..f5a68e7 100644 --- a/src/ppu_setppu.h +++ b/src/ppu_setppu.h @@ -1450,11 +1450,9 @@ void S9xSetPPU(uint8 Byte, uint16 Address) if (Address <= 0x2183) { #ifdef __OLD_RASTER_FX__ - - if (!snesMenuOptions.delayedRasterFX) SetPPU[Address - 0x2100](Byte, Address); - else + SetPPU[Address - 0x2100](Byte, Address); #endif - SetPPU_delayedRasterFx[Address - 0x2100](Byte, Address); + SetPPU_delayedRasterFx[Address - 0x2100](Byte, Address); return; } else |