From 97835607d9ab054415b05f920c03c43c4c9a692b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 3 Feb 2018 20:46:47 -1000 Subject: [PATCH] More windows build fixes --- NESEmulator/CNESEmulator.cpp | 28 +++++++++++++-------------- NESEmulator/CNESEmulator.hpp | 2 +- NESEmulator/fixNES | 2 +- Runtime/AutoMapper/CAutoMapper.hpp | 2 +- Runtime/CGameDebug.hpp | 2 +- Runtime/CGameOptions.hpp | 2 +- Runtime/CStateManager.hpp | 2 +- Runtime/Camera/CCameraManager.hpp | 2 +- Runtime/Camera/CGameCamera.hpp | 2 +- Runtime/Character/CBodyController.hpp | 2 +- Runtime/GuiSys/CGuiFrame.hpp | 2 +- Runtime/GuiSys/CGuiWidget.hpp | 2 +- Runtime/GuiSys/CHudDecoInterface.hpp | 2 +- Runtime/GuiSys/CScanDisplay.hpp | 2 +- Runtime/Input/ControlMapper.hpp | 2 +- Runtime/MP1/CMessageScreen.hpp | 2 +- Runtime/MP1/CQuitGameScreen.hpp | 2 +- Runtime/MP1/CSaveGameScreen.hpp | 2 +- Runtime/Weapon/CPlayerGun.hpp | 2 +- Runtime/World/CMorphBall.hpp | 2 +- Runtime/World/CPlayer.hpp | 2 +- 21 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NESEmulator/CNESEmulator.cpp b/NESEmulator/CNESEmulator.cpp index 3296e1394..2387e18db 100644 --- a/NESEmulator/CNESEmulator.cpp +++ b/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) { diff --git a/NESEmulator/CNESEmulator.hpp b/NESEmulator/CNESEmulator.hpp index f717eb1bc..419e3be12 100644 --- a/NESEmulator/CNESEmulator.hpp +++ b/NESEmulator/CNESEmulator.hpp @@ -9,7 +9,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class IDvdRequest; namespace MP1 diff --git a/NESEmulator/fixNES b/NESEmulator/fixNES index 01b5bde49..25527a513 160000 --- a/NESEmulator/fixNES +++ b/NESEmulator/fixNES @@ -1 +1 @@ -Subproject commit 01b5bde49a730eb287b18def7ed5e5f510cda7b5 +Subproject commit 25527a513dc635fa87014970618fbfb7dfe3e5c6 diff --git a/Runtime/AutoMapper/CAutoMapper.hpp b/Runtime/AutoMapper/CAutoMapper.hpp index 88c528b22..dc3f3145c 100644 --- a/Runtime/AutoMapper/CAutoMapper.hpp +++ b/Runtime/AutoMapper/CAutoMapper.hpp @@ -10,7 +10,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class IWorld; class CMapWorldInfo; class CStateManager; diff --git a/Runtime/CGameDebug.hpp b/Runtime/CGameDebug.hpp index 791d5ea94..de5d34f5d 100644 --- a/Runtime/CGameDebug.hpp +++ b/Runtime/CGameDebug.hpp @@ -5,7 +5,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; const char* StringForControlOption(int); diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp index daf98dae6..c80f46555 100644 --- a/Runtime/CGameOptions.hpp +++ b/Runtime/CGameOptions.hpp @@ -7,7 +7,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class CStateManager; /** Options presented in UI */ diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index f6c4cbd11..db7ebd2cc 100644 --- a/Runtime/CStateManager.hpp +++ b/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; diff --git a/Runtime/Camera/CCameraManager.hpp b/Runtime/Camera/CCameraManager.hpp index be9206b8e..a476a4441 100644 --- a/Runtime/Camera/CCameraManager.hpp +++ b/Runtime/Camera/CCameraManager.hpp @@ -14,7 +14,7 @@ class CGameCamera; class CCameraShakeData; class CScriptWater; class CInterpolationCamera; -class CFinalInput; +struct CFinalInput; class CScriptCameraHint; class CCinematicCamera; diff --git a/Runtime/Camera/CGameCamera.hpp b/Runtime/Camera/CGameCamera.hpp index b5091f953..9b7ea669b 100644 --- a/Runtime/Camera/CGameCamera.hpp +++ b/Runtime/Camera/CGameCamera.hpp @@ -6,7 +6,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class CGameCamera : public CActor { diff --git a/Runtime/Character/CBodyController.hpp b/Runtime/Character/CBodyController.hpp index df2623b05..60137f40e 100644 --- a/Runtime/Character/CBodyController.hpp +++ b/Runtime/Character/CBodyController.hpp @@ -12,7 +12,7 @@ namespace urde class CActor; class CAnimPlaybackParms; -class CFinalInput; +struct CFinalInput; class CPASAnimParmData; class CRandom16; class CStateManager; diff --git a/Runtime/GuiSys/CGuiFrame.hpp b/Runtime/GuiSys/CGuiFrame.hpp index 1f0172d4a..487858555 100644 --- a/Runtime/GuiSys/CGuiFrame.hpp +++ b/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; diff --git a/Runtime/GuiSys/CGuiWidget.hpp b/Runtime/GuiSys/CGuiWidget.hpp index ed197f84d..54e353de6 100644 --- a/Runtime/GuiSys/CGuiWidget.hpp +++ b/Runtime/GuiSys/CGuiWidget.hpp @@ -9,7 +9,7 @@ namespace urde { class CGuiFrame; class CGuiTextSupport; -class CFinalInput; +struct CFinalInput; class CSimplePool; enum class ETraversalMode diff --git a/Runtime/GuiSys/CHudDecoInterface.hpp b/Runtime/GuiSys/CHudDecoInterface.hpp index 3c8502689..a3802d0bf 100644 --- a/Runtime/GuiSys/CHudDecoInterface.hpp +++ b/Runtime/GuiSys/CHudDecoInterface.hpp @@ -11,7 +11,7 @@ namespace urde { class CGuiFrame; -class CFinalInput; +struct CFinalInput; class CStateManager; class CGuiCamera; class CGuiWidget; diff --git a/Runtime/GuiSys/CScanDisplay.hpp b/Runtime/GuiSys/CScanDisplay.hpp index a3a1a7b4c..60cbcbb2b 100644 --- a/Runtime/GuiSys/CScanDisplay.hpp +++ b/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; diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp index 76577dad7..bdbcb45cc 100644 --- a/Runtime/Input/ControlMapper.hpp +++ b/Runtime/Input/ControlMapper.hpp @@ -3,7 +3,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class ControlMapper { diff --git a/Runtime/MP1/CMessageScreen.hpp b/Runtime/MP1/CMessageScreen.hpp index ec96270df..15118b129 100644 --- a/Runtime/MP1/CMessageScreen.hpp +++ b/Runtime/MP1/CMessageScreen.hpp @@ -8,7 +8,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class CGuiWidget; class CGuiTextPane; class CGuiModel; diff --git a/Runtime/MP1/CQuitGameScreen.hpp b/Runtime/MP1/CQuitGameScreen.hpp index dde9e1cbb..f9ed96bcb 100644 --- a/Runtime/MP1/CQuitGameScreen.hpp +++ b/Runtime/MP1/CQuitGameScreen.hpp @@ -7,7 +7,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class CGuiFrame; class CGuiTableGroup; class CGuiTextPane; diff --git a/Runtime/MP1/CSaveGameScreen.hpp b/Runtime/MP1/CSaveGameScreen.hpp index a92436c68..41714eb45 100644 --- a/Runtime/MP1/CSaveGameScreen.hpp +++ b/Runtime/MP1/CSaveGameScreen.hpp @@ -13,7 +13,7 @@ class CTexture; class CStringTable; class CGuiFrame; class CSaveWorld; -class CFinalInput; +struct CFinalInput; class CGuiTextPane; class CGuiTableGroup; diff --git a/Runtime/Weapon/CPlayerGun.hpp b/Runtime/Weapon/CPlayerGun.hpp index 10a158bd0..94f027859 100644 --- a/Runtime/Weapon/CPlayerGun.hpp +++ b/Runtime/Weapon/CPlayerGun.hpp @@ -25,7 +25,7 @@ namespace urde { -class CFinalInput; +struct CFinalInput; class CPlayerGun { diff --git a/Runtime/World/CMorphBall.hpp b/Runtime/World/CMorphBall.hpp index 5736f4964..9b4de0fe8 100644 --- a/Runtime/World/CMorphBall.hpp +++ b/Runtime/World/CMorphBall.hpp @@ -19,7 +19,7 @@ namespace urde class CActorLights; class CPlayer; class CDamageInfo; -class CFinalInput; +struct CFinalInput; class CScriptWater; class CStateManager; diff --git a/Runtime/World/CPlayer.hpp b/Runtime/World/CPlayer.hpp index 71042a68d..952fd777c 100644 --- a/Runtime/World/CPlayer.hpp +++ b/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;