PCSX2-Counters: Remove default video mode variable

* Fixes a bug where NTSC VideoMode was automatically used when videomode is uninitialized. the bug was only temporary till the SMODE register was written.
PCSX2 · Jul 9, 2016 · e7d4bc4 · e7d4bc4
1 parent a1fdf1e
commit e7d4bc4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/pcsx2/Config.h b/pcsx2/Config.h
@@ -288,11 +288,6 @@ struct Pcsx2Config
 		bool	FrameSkipEnable;
 		bool	VsyncEnable;
 
-		// The region mode controls the default Maximum/Minimum FPS settings and also
-		// regulates the vsync rates (which in turn control the IOP's SPU2 tick sync and ensure
-		// proper audio playback speed).
-		int		DefaultVideoMode;	// 0=NTSC and 1=PAL
-
 		int		FramesToDraw;	// number of consecutive frames (fields) to render
 		int		FramesToSkip;	// number of consecutive frames (fields) to skip
 
@@ -318,7 +313,6 @@ struct Pcsx2Config
 				OpEqu( FramerateNTSC )			&&
 				OpEqu( FrameratePAL )			&&
 
-				OpEqu( DefaultVideoMode )		&&
 				OpEqu( FramesToDraw )			&&
 				OpEqu( FramesToSkip );
 		}

diff --git a/pcsx2/Counters.cpp b/pcsx2/Counters.cpp
@@ -155,9 +155,6 @@ void rcntInit()
 	vsyncCounter.Mode = MODE_VRENDER;
 	vsyncCounter.sCycle = cpuRegs.cycle;
 
-	// Set the video mode to user's default request:
-	gsSetVideoMode( (GS_VideoMode)EmuConfig.GS.DefaultVideoMode );
-
 	for (i=0; i<4; i++) rcntReset(i);
 	cpuRcntSet();
 }

diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
@@ -206,7 +206,6 @@ Pcsx2Config::GSOptions::GSOptions()
 	DisableOutput			= false;
 	VsyncQueueSize			= 2;
 
-	DefaultVideoMode		= NTSC;
 	FramesToDraw			= 2;
 	FramesToSkip			= 2;
 
@@ -231,10 +230,6 @@ void Pcsx2Config::GSOptions::LoadSave( IniInterface& ini )
 	IniEntry( FramerateNTSC );
 	IniEntry( FrameratePAL );
 
-	// WARNING: array must be NULL terminated to compute it size
-	static const wxChar * const ntsc_pal_str[3] =  { L"ntsc", L"pal", NULL };
-	ini.EnumEntry( L"DefaultRegionMode", DefaultVideoMode, ntsc_pal_str, DefaultVideoMode );
-
 	IniEntry( FramesToDraw );
 	IniEntry( FramesToSkip );
 }