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

reorganize overclocking variabls from r3120 to be in the core emulator instead of all jumbled up among modules

This commit is contained in:
zeromus 2015-06-18 06:26:38 +00:00
parent 72f2d47f3a
commit 14fdc3cdb6
7 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/src/drivers/win/main.cpp
View File

@ -147,12 +147,6 @@ int genie = 0;
int pal_emulation = 0;
int pal_setting_specified = 0;
int dendy = 0;
// overclock the console by adding dummy scanlines to PPU loop
// disables DMC DMA and WaveHi filling for these dummies
// doesn't work with new PPU
bool overclocked = 0;
// 7-bit samples have priority over overclocking
bool skip_7bit_overclocking = 1;
bool swapDuty = 0; // some Famicom and NES clones had duty cycle bits swapped
int ntsccol = 0, ntsctint, ntschue;
std::string BaseDirectory;

6
trunk/src/drivers/win/main.h
View File

@ -57,11 +57,7 @@ extern int EnableBackgroundInput;
extern int AFon;
extern int AFoff;
extern int AutoFireOffset;
extern int normalscanlines;
extern int extrascanlines;
extern int totalscanlines;
extern bool overclocked;
extern bool skip_7bit_overclocking;
extern int vmod;

1
trunk/src/drivers/win/timing.cpp
View File

@ -2,6 +2,7 @@
#include "main.h"
#include "gui.h"
#include "resource.h"
#include "fceu.h"
char str[5];
extern int newppu;

13
trunk/src/fceu.cpp
View File

@ -53,6 +53,19 @@ extern void ResetDebugStatisticsCounters();
extern void SetMainWindowText();
extern bool isTaseditorRecording();
//-----------
//overclocking-related
// overclock the console by adding dummy scanlines to PPU loop
// disables DMC DMA and WaveHi filling for these dummies
// doesn't work with new PPU
bool overclocked = 0;
// 7-bit samples have priority over overclocking
bool skip_7bit_overclocking = 1;
int normalscanlines;
int extrascanlines = 0;
int totalscanlines;
//------------
extern int32 fps_scale;
extern int32 fps_scale_unpaused;
extern int32 fps_scale_frameadvance;

7
trunk/src/fceu.h
View File

@ -7,6 +7,13 @@ extern int fceuindbg;
extern int newppu;
void ResetGameLoaded(void);
//overclocking-related
extern bool overclocked;
extern bool skip_7bit_overclocking;
extern int normalscanlines;
extern int extrascanlines;
extern int totalscanlines;
extern bool AutoResumePlay;
extern char romNameWhenClosingEmulator[];

3
trunk/src/ppu.cpp
View File

@ -343,9 +343,6 @@ static int maxsprites = 8;
//scanline is equal to the current visible scanline we're on.
int scanline;
int normalscanlines;
int extrascanlines = 0;
int totalscanlines;
int g_rasterpos;
static uint32 scanlines_per_frame;

3
trunk/src/ppu.h
View File

@ -21,7 +21,6 @@ uint8* FCEUPPU_GetCHR(uint32 vadr, uint32 refreshaddr);
void ppu_getScroll(int &xpos, int &ypos);
#ifdef _MSC_VER
#define FASTCALL __fastcall
#else
@ -36,8 +35,6 @@ void FFCEUX_PPUWrite_Default(uint32 A, uint8 V);
extern int g_rasterpos;
extern uint8 PPU[4];
extern bool overclocked;
extern bool skip_7bit_overclocking;
extern bool DMC_7bit;
enum PPUPHASE {