ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from negativeExponent/fix_ntsc_clip 

Clip Left/Right Sides option now taken into account when using NTSC s…
This commit is contained in:
thor2016 2024-01-26 22:04:15 -05:00 committed by GitHub
parent 23cf99afe5 82a99060e5
commit 4f604b7708
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/Qt/sdl-video.cpp
View File

@ -62,8 +62,10 @@ static int s_fullscreen = 0;
static int noframe = 0;
static int initBlitToHighDone = 0;
#define NWIDTH (256 - (s_clipSides ? 16 : 0))
#define NOFFSET (s_clipSides ? 8 : 0)
#define NWIDTH (256 - (s_clipSides ? 16 : 0))
#define NOFFSET (s_clipSides ? 8 : 0)
#define NTSCWIDTH (301 - (s_clipSides ? 19 : 0))
static int s_paletterefresh = 1;
@ -168,7 +170,7 @@ void CalcVideoDimensions(void)
int iScale = nes_shm->video.xscale;
if ( s_sponge == 3 )
{
nes_shm->video.ncol = iScale*301;
nes_shm->video.ncol = iScale*NTSCWIDTH;
}
else
{
@ -264,7 +266,7 @@ int InitVideo(FCEUGI *gi)
int iScale = nes_shm->video.xscale;
if ( s_sponge == 3 )
{
nes_shm->video.ncol = iScale*301;
nes_shm->video.ncol = iScale*NTSCWIDTH;
}
else
{
@ -446,7 +448,7 @@ doBlitScreen(uint8_t *XBuf, uint8_t *dest)
if ( s_sponge == 3 )
{
w = ixScale*301;
w = ixScale*NTSCWIDTH;
bw = 256;
}
else

4
src/drivers/common/vidblit.cpp
View File

@ -29,6 +29,7 @@
#include "../../palette.h"
#include "../../utils/memory.h"
#include "nes_ntsc.h"
#include "video.h"
extern u8 *XBuf;
extern u8 *XBackBuf;
@ -858,10 +859,9 @@ void Blit8ToHigh(uint8 *src, uint8 *dest, int xr, int yr, int pitch, int xscale,
{
case 4:
if ( nes_ntsc && GameInfo && GameInfo->type!=GIT_NSF) {
int outxr = 301;
int outxr = 301 - (ClipSidesOffset ? 19 : 0);
//if(xr == 282) outxr = 282; //hack for windows
burst_phase ^= 1;
u8* srcD = XDBuf + (src-XBuf); // get deemphasis buffer
nes_ntsc_blit( nes_ntsc, (unsigned char*)src, (unsigned char*)srcD, xr, burst_phase, xr, yr, ntscblit, (2*outxr) * Bpp );