AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

More windows build fixes

This commit is contained in:
Jack Andersen 2018-02-03 20:46:47 -10:00
parent fa44ab57e8
commit 97835607d9
21 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
NESEmulator/CNESEmulator.cpp
View File

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

2
NESEmulator/CNESEmulator.hpp
View File

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

2
NESEmulator/fixNES

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

2
Runtime/AutoMapper/CAutoMapper.hpp
View File

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

2
Runtime/CGameDebug.hpp
View File

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

2
Runtime/CGameOptions.hpp
View File

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

2
Runtime/CStateManager.hpp
View File

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

2
Runtime/Camera/CCameraManager.hpp
View File

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

2
Runtime/Camera/CGameCamera.hpp
View File

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

2
Runtime/Character/CBodyController.hpp
View File

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

2
Runtime/GuiSys/CGuiFrame.hpp
View File

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

2
Runtime/GuiSys/CGuiWidget.hpp
View File

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

2
Runtime/GuiSys/CHudDecoInterface.hpp
View File

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

2
Runtime/GuiSys/CScanDisplay.hpp
View File

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

2
Runtime/Input/ControlMapper.hpp
View File

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

2
Runtime/MP1/CMessageScreen.hpp
View File

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

2
Runtime/MP1/CQuitGameScreen.hpp
View File

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

2
Runtime/MP1/CSaveGameScreen.hpp
View File

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

2
Runtime/Weapon/CPlayerGun.hpp
View File

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

2
Runtime/World/CMorphBall.hpp
View File

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

2
Runtime/World/CPlayer.hpp
View File

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