Move settings-related vars to FSettings struct

- Just some more cleanups

src/fceu.h

@@ -5,27 +5,6 @@
 
 extern int fceuindbg;
 
-/* Overclocking-related */
-extern unsigned overclock_enabled;
-extern unsigned overclocked;
-extern unsigned skip_7bit_overclocking;
-extern unsigned DMC_7bit;
-extern unsigned totalscanlines;
-extern unsigned normal_scanlines;
-extern unsigned extrascanlines;
-extern unsigned vblankscanlines;
-
-/* Region selection */
-extern unsigned dendy;
-
-/* Audio mods*/
-extern unsigned swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
-                           * found on some famiclones/Dendy models.
-                           */
-
-extern int show_crosshair;
-extern int option_ramstate;
-
 void ResetGameLoaded(void);
 
 #define DECLFR(x) uint8 FP_FASTAPASS(1) x(uint32 A)
@@ -82,6 +61,9 @@ extern uint8 PAL;
 
 #include "driver.h"
 
+#define	SCANLINES_NORMAL 240
+#define SCANLINES_DENDY  290
+
 typedef struct {
 	int PAL;
 	int NetworkPlay;
@@ -105,6 +87,21 @@ typedef struct {
 	uint32 SndRate;
 	int soundq;
 	int lowpass;
+
+	/* PPU Overclocking */
+	int overclock_enabled;		/* 1 : enable, 0 : disable duh! */
+	int skip_7bit_overclocking;	/* 7-bit samples have priority over overclocking */
+	int extrascanlines;
+	int vblankscanlines;
+	int normal_scanlines;		/* 240 : normal, 290 : dendy */
+	int totalscanlines;
+
+	int show_crosshair;
+	int ramstate;
+	int dendy;
+	int swapDuty; /* Swap bits 6 & 7 of $4000/$4004 to mimic bug
+                           * found on some famiclones/Dendy models.
+                           */
 } FCEUS;
 
 extern FCEUS FSettings;