diff --git a/src/drivers/win/input.h b/src/drivers/win/input.h
index 4b467742..efce2b56 100644
--- a/src/drivers/win/input.h
+++ b/src/drivers/win/input.h
@@ -1,3 +1,8 @@
+#ifndef WIN_INPUT_H
+#define WIN_INPU_H
+
+#include "dinput.h"
+
void ConfigInput(HWND hParent);
int InitDInput(void);
void CreateInputStuff(void);
@@ -51,3 +56,4 @@ extern const char* ScanNames[];
extern CFGSTRUCT HotkeyConfig[];
#endif
+#endif
\ No newline at end of file
diff --git a/src/drivers/win/main.cpp b/src/drivers/win/main.cpp
index be0a1953..92d1bf78 100644
--- a/src/drivers/win/main.cpp
+++ b/src/drivers/win/main.cpp
@@ -36,15 +36,14 @@
#include "../../fceu.h"
#include "../../state.h"
#include "../../debug.h"
-#include "ppuview.h"
-#include "debugger.h"
#include "input.h"
#include "netplay.h"
#include "joystick.h"
#include "keyboard.h"
+#include "ppuview.h"
+#include "debugger.h"
#include "cheat.h"
#include "debug.h"
-#include "ppuview.h"
#include "ntview.h"
#include "memview.h"
#include "tracer.h"
@@ -54,6 +53,8 @@
#include "basicbot.h"
#include "args.h"
#include "config.h"
+#include "sound.h"
+#include "wave.h"
//---------------------------
//mbg merge 6/29/06 - new aboutbox
@@ -107,33 +108,23 @@ HRESULT ddrval;
static char TempArray[2048];
-/**
-* Contains the base directory of FCE
-**/
-static char BaseDirectory[2048];
+int totallines = 0;
static int exiting = 0;
static volatile int moocow = 0;
static int windowedfailed;
-static volatile int nofocus = 0;
static volatile int _userpause = 0; //mbg merge 7/18/06 changed tasbuild was using this only in a couple of places
extern int autoHoldKey, autoHoldClearKey;
extern int frame_display, input_display;
-//mbg merge 7/17/06 did these have to be unsigned?
-static int srendline, erendline;
-static int totallines;
-
int soundo = 1;
//mbg 6/30/06 - indicates that the main loop should close the game as soon as it can
int closeGame = 0;
-static int changerecursive=0;
-
// qfox 09/17/06: moved the skipcount outside because it was completely pointless
// in there.
/**
@@ -227,7 +218,7 @@ void RemoveDirs()
/**
* Creates the default directories.
**/
-void CreateDirs(void)
+void CreateDirs()
{
DefaultDirectoryWalker(DirectoryCreator);
}
@@ -254,7 +245,7 @@ void GetBaseDirectory(void)
}
}
-int BlockingCheck(void)
+int BlockingCheck()
{
MSG msg;
moocow = 1;
@@ -273,7 +264,7 @@ int BlockingCheck(void)
return exiting ? 0 : 1;
}
-static void FixFL(void)
+void FixFL()
{
FCEUI_GetCurrentVidSystem(&srendline, &erendline);
totallines = erendline - srendline + 1;
@@ -320,7 +311,7 @@ const char *FCEUD_GetCompilerString()
/**
* Displays the about box
**/
-void ShowAboutBox(void)
+void ShowAboutBox()
{
MessageBox(hAppWnd, FCEUI_GetAboutString(), FCEU_NAME, MB_OK);
}
@@ -360,7 +351,7 @@ void DoFCEUExit()
/**
* Changes the thread priority of the main thread.
**/
-void DoPriority(void)
+void DoPriority()
{
if(eoptions & EO_HIGHPRIO)
{
@@ -380,9 +371,7 @@ void DoPriority(void)
// TODO: HORRIBLE
-//#include "sound.cpp"
#include "video.cpp"
-#include "window.cpp"
int DriverInitialize()
{
diff --git a/src/drivers/win/main.h b/src/drivers/win/main.h
index 234f838f..0bfef342 100644
--- a/src/drivers/win/main.h
+++ b/src/drivers/win/main.h
@@ -69,8 +69,32 @@ static int erendlinep = 239;
static int ntsccol = 0, ntsctint, ntschue;
+extern int totallines;
+
+//mbg merge 7/17/06 did these have to be unsigned?
+static int srendline, erendline;
+
+static int changerecursive=0;
+
+static volatile int nofocus = 0;
+
+/**
+* Contains the base directory of FCE
+**/
+static char BaseDirectory[2048];
+
extern int soundo;
extern int eoptions;
extern int soundoptions;
+extern uint8 *xbsave;
+
+void FixFL();
+void DoFCEUExit();
+void ShowAboutBox();
+int BlockingCheck();
+void DoPriority();
+void RemoveDirs();
+void CreateDirs();
+void SetDirs();
#endif
\ No newline at end of file
diff --git a/src/drivers/win/state.cpp b/src/drivers/win/state.cpp
index 3674d1e1..8b66a403 100644
--- a/src/drivers/win/state.cpp
+++ b/src/drivers/win/state.cpp
@@ -1,3 +1,5 @@
+#include "common.h"
+
/**
* Show an Save File dialog and save a savegame state to the selected file.
**/
diff --git a/src/drivers/win/video.cpp b/src/drivers/win/video.cpp
index 83e6e620..68486b6d 100644
--- a/src/drivers/win/video.cpp
+++ b/src/drivers/win/video.cpp
@@ -1067,7 +1067,7 @@ BOOL CALLBACK VideoConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
return 0;
}
-static void SetFSVideoMode(void)
+void SetFSVideoMode()
{
changerecursive=1;
if(!SetVideoMode(1))
diff --git a/src/drivers/win/video.h b/src/drivers/win/video.h
index 119e5815..b57d9262 100644
--- a/src/drivers/win/video.h
+++ b/src/drivers/win/video.h
@@ -65,5 +65,6 @@ int SetVideoMode(int fs);
void DoVideoConfigFix();
void FCEUD_BlitScreen(uint8 *XBuf);
void ResetVideo();
+void SetFSVideoMode();
#endif
\ No newline at end of file
diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp
index 5385b531..2259c215 100644
--- a/src/drivers/win/window.cpp
+++ b/src/drivers/win/window.cpp
@@ -18,10 +18,25 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "window.h"
+#include "main.h"
#include "state.cpp" /* Save/Load state AS */
#include "sound.h"
#include "wave.h"
+#include "input.h"
+#include "video.h"
+#include "../../input.h"
+
+#include "ppuview.h"
+#include "debugger.h"
+#include "cheat.h"
+#include "debug.h"
+#include "ntview.h"
+#include "memview.h"
+#include "tracer.h"
+#include "cdlogger.h"
+#include "basicbot.h"
// #defines
@@ -52,6 +67,8 @@ void ConfigGUI();
void ConfigTiming();
void ConfigPalette();
void ConfigDirectories();
+void SetAutoFirePattern(int onframes, int offframes);
+void SetAutoFireOffset(int offset);
void RestartMovieOrReset(unsigned int pow);
int KeyboardSetBackgroundAccess(int on); //mbg merge 7/17/06 YECH had to add
@@ -485,7 +502,7 @@ void FCEUD_HideMenuToggle(void)
ToggleHideMenu();
}
-static void ALoad(char *nameo)
+void ALoad(char *nameo)
{
if(FCEUI_LoadGame(nameo, 1))
{
@@ -1289,7 +1306,7 @@ void UpdateFCEUWindow(void)
/**
* Destroys the main window
**/
-void ByebyeWindow(void)
+void ByebyeWindow()
{
SetMenu(hAppWnd, 0);
DestroyMenu(fceumenu);
@@ -1301,7 +1318,7 @@ void ByebyeWindow(void)
*
* @return Flag that indicates failure (0) or success (1)
**/
-int CreateMainWindow(void)
+int CreateMainWindow()
{
WNDCLASSEX winclass;
RECT tmp;
@@ -1624,7 +1641,7 @@ BOOL CALLBACK TimingConCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
return 0;
}
-void DoTimingConfigFix(void)
+void DoTimingConfigFix()
{
DoPriority();
}
diff --git a/vc8/fceux.vcproj b/vc8/fceux.vcproj
index 1f985978..e46ade74 100644
--- a/vc8/fceux.vcproj
+++ b/vc8/fceux.vcproj
@@ -1074,6 +1074,10 @@
RelativePath="..\src\drivers\win\wave.h"
>
+
+