More windows build fixes

NESEmulator/CNESEmulator.cpp

@@ -239,11 +239,11 @@ void CNESEmulator::InitializeEmulator()
 
     sprintf(window_title_pause, "%s (Pause)", window_title);
     #if DEBUG_HZ
-	emuFrameStart = GetTickCount();
-	#endif
-	#if DEBUG_MAIN_CALLS
-	emuMainFrameStart = GetTickCount();
-	#endif
+    emuFrameStart = GetTickCount();
+    #endif
+    #if DEBUG_MAIN_CALLS
+    emuMainFrameStart = GetTickCount();
+    #endif
     cpuCycleTimer = nesPAL ? 16 : 12;
     //do full frame per update loop
     ppuCycleTimer = nesPAL ? 5 : 4;
@@ -471,15 +471,15 @@ void CNESEmulator::NesEmuMainLoop(bool forceDraw)
                     fm2playUpdate();
 #if DEBUG_HZ
                 emuTimesCalled++;
-				int end = GetTickCount();
-				emuTotalElapsed += end - emuFrameStart;
-				if(emuTotalElapsed >= 1000)
-				{
-					printf("\r%iHz   ", emuTimesCalled);
-					emuTimesCalled = 0;
-					emuTotalElapsed = 0;
-				}
-				emuFrameStart = end;
+                int end = GetTickCount();
+                emuTotalElapsed += end - emuFrameStart;
+                if(emuTotalElapsed >= 1000)
+                {
+                    printf("\r%iHz   ", emuTimesCalled);
+                    emuTimesCalled = 0;
+                    emuTotalElapsed = 0;
+                }
+                emuFrameStart = end;
 #endif
                 if(ppuDebugPauseFrame)
                 {

NESEmulator/CNESEmulator.hpp

@@ -9,7 +9,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 class IDvdRequest;
 
 namespace MP1

NESEmulator/fixNES

@@ -1 +1 @@
-Subproject commit 01b5bde49a730eb287b18def7ed5e5f510cda7b5
+Subproject commit 25527a513dc635fa87014970618fbfb7dfe3e5c6

Runtime/AutoMapper/CAutoMapper.hpp

@@ -10,7 +10,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 class IWorld;
 class CMapWorldInfo;
 class CStateManager;

Runtime/CGameDebug.hpp

@@ -5,7 +5,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 
 const char* StringForControlOption(int);
 

Runtime/CGameOptions.hpp

@@ -7,7 +7,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 class CStateManager;
 
 /** Options presented in UI */

Runtime/CStateManager.hpp

@@ -40,7 +40,7 @@ class CActor;
 class CLight;
 class CDamageInfo;
 class CMaterialFilter;
-class CFinalInput;
+struct CFinalInput;
 class CPlayer;
 class CWorld;
 class CTexture;

Runtime/Camera/CCameraManager.hpp

@@ -14,7 +14,7 @@ class CGameCamera;
 class CCameraShakeData;
 class CScriptWater;
 class CInterpolationCamera;
-class CFinalInput;
+struct CFinalInput;
 class CScriptCameraHint;
 class CCinematicCamera;
 

Runtime/Camera/CGameCamera.hpp

@@ -6,7 +6,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 
 class CGameCamera : public CActor
 {

Runtime/Character/CBodyController.hpp

@@ -12,7 +12,7 @@ namespace urde
 
 class CActor;
 class CAnimPlaybackParms;
-class CFinalInput;
+struct CFinalInput;
 class CPASAnimParmData;
 class CRandom16;
 class CStateManager;

Runtime/GuiSys/CGuiFrame.hpp

@@ -12,7 +12,7 @@ namespace urde
 class CGuiSys;
 class CLight;
 class CGuiCamera;
-class CFinalInput;
+struct CFinalInput;
 class CGuiLight;
 class CVParamTransfer;
 class CObjectReference;

Runtime/GuiSys/CGuiWidget.hpp

@@ -9,7 +9,7 @@ namespace urde
 {
 class CGuiFrame;
 class CGuiTextSupport;
-class CFinalInput;
+struct CFinalInput;
 class CSimplePool;
 
 enum class ETraversalMode

Runtime/GuiSys/CHudDecoInterface.hpp

@@ -11,7 +11,7 @@
 namespace urde
 {
 class CGuiFrame;
-class CFinalInput;
+struct CFinalInput;
 class CStateManager;
 class CGuiCamera;
 class CGuiWidget;

Runtime/GuiSys/CScanDisplay.hpp

@@ -14,7 +14,7 @@ namespace urde
 class CGuiTextPane;
 class CGuiWidget;
 class CGuiModel;
-class CFinalInput;
+struct CFinalInput;
 class CGuiFrame;
 class CAuiImagePane;
 class CStringTable;

Runtime/Input/ControlMapper.hpp

@@ -3,7 +3,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 
 class ControlMapper
 {

Runtime/MP1/CMessageScreen.hpp

@@ -8,7 +8,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 class CGuiWidget;
 class CGuiTextPane;
 class CGuiModel;

Runtime/MP1/CQuitGameScreen.hpp

@@ -7,7 +7,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 class CGuiFrame;
 class CGuiTableGroup;
 class CGuiTextPane;

Runtime/MP1/CSaveGameScreen.hpp

@@ -13,7 +13,7 @@ class CTexture;
 class CStringTable;
 class CGuiFrame;
 class CSaveWorld;
-class CFinalInput;
+struct CFinalInput;
 class CGuiTextPane;
 class CGuiTableGroup;
 

Runtime/Weapon/CPlayerGun.hpp

@@ -25,7 +25,7 @@
 
 namespace urde
 {
-class CFinalInput;
+struct CFinalInput;
 
 class CPlayerGun
 {

Runtime/World/CMorphBall.hpp

@@ -19,7 +19,7 @@ namespace urde
 class CActorLights;
 class CPlayer;
 class CDamageInfo;
-class CFinalInput;
+struct CFinalInput;
 class CScriptWater;
 class CStateManager;
 

Runtime/World/CPlayer.hpp

@@ -17,7 +17,7 @@ class CPlayerGun;
 class CDamageInfo;
 class CScriptWater;
 class IVisitor;
-class CFinalInput;
+struct CFinalInput;
 class CPlayerCameraBob;
 class CFirstPersonCamera;
 class CCollidableSphere;