admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move settings-related vars to FSettings struct

Browse Source 
- Just some more cleanups
This commit is contained in:
negativeExponent
2021-06-02 04:18:49 +08:00
parent 403f682eb7
commit 46ca02a206
11 changed files with 94 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/fceu.c
View File

@@ -341,6 +341,14 @@ int FCEUI_Initialize(void) {
FSettings.UsrLastSLine[0] = 231;
FSettings.UsrLastSLine[1] = 239;
FSettings.SoundVolume = 100;
FSettings.overclock_enabled = 0;
FSettings.skip_7bit_overclocking = 1;
FSettings.totalscanlines = 0;
FSettings.normal_scanlines = SCANLINES_NORMAL;
FSettings.extrascanlines = 0;
FSettings.vblankscanlines = 0;
FSettings.dendy = 0;
FSettings.swapDuty = 0;
FCEUPPU_Init();
X6502_Init();
return 1;
@@ -381,8 +389,6 @@ void ResetNES(void)
X6502_Reset();
}
int option_ramstate = 0;
void FCEU_MemoryRand(uint8 *ptr, uint32 size)
{
int x = 0;
@@ -397,7 +403,7 @@ void FCEU_MemoryRand(uint8 *ptr, uint32 size)
/* 1942 SCORE/HISCORE is screwed... */
#endif
uint8_t v = 0;
switch (option_ramstate)
switch (FSettings.ramstate)
{
case 0: v = 0xff; break;
case 1: v = 0x00; break;
@@ -466,7 +472,7 @@ void FCEU_ResetVidSys(void)
else if (GameInfo->vidsys == GIV_PAL)
{
w = 1;
dendy = 0;
FSettings.dendy = 0;
}
else
w = FSettings.PAL;
@@ -474,12 +480,12 @@ void FCEU_ResetVidSys(void)
PAL = w ? 1 : 0;
if (PAL)
dendy = 0;
FSettings.dendy = 0;
normal_scanlines = dendy ? 290 : 240;
totalscanlines = normal_scanlines + (overclock_enabled ? extrascanlines : 0);
FSettings.normal_scanlines = FSettings.dendy ? SCANLINES_DENDY : SCANLINES_NORMAL;
FSettings.totalscanlines = FSettings.normal_scanlines + (FSettings.overclock_enabled ? FSettings.extrascanlines : 0);
FCEUPPU_SetVideoSystem(w || dendy);
FCEUPPU_SetVideoSystem(w || FSettings.dendy);
SetSoundVariables();
}
@@ -517,7 +523,7 @@ void FCEUI_SetRenderedLines(int ntscf, int ntscl, int palf, int pall)
FSettings.UsrLastSLine[0] = ntscl;
FSettings.UsrFirstSLine[1] = palf;
FSettings.UsrLastSLine[1] = pall;
if (PAL || dendy)
if (PAL || FSettings.dendy)
{
FSettings.FirstSLine = FSettings.UsrFirstSLine[1];
FSettings.LastSLine = FSettings.UsrLastSLine[1];
@@ -561,7 +567,7 @@ void FCEUI_SetSnapName(int a)
int32 FCEUI_GetDesiredFPS(void)
{
if (PAL || dendy)
if (PAL || FSettings.dendy)
return(838977920); /* ~50.007 */
else
return(1008307711); /* ~60.1 */