summaryrefslogtreecommitdiffstats
path: root/src/core/Timer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/Timer.h')
-rw-r--r--src/core/Timer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/Timer.h b/src/core/Timer.h
index e7b6fec8..393242dd 100644
--- a/src/core/Timer.h
+++ b/src/core/Timer.h
@@ -18,7 +18,7 @@ public:
static const float &GetTimeStep(void) { return ms_fTimeStep; }
static void SetTimeStep(float ts) { ms_fTimeStep = ts; }
static float GetTimeStepInSeconds() { return ms_fTimeStep / 50.0f; }
- static float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
+ static uint32 GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
static const float &GetTimeStepNonClipped(void) { return ms_fTimeStepNonClipped; }
static float GetTimeStepNonClippedInSeconds(void) { return ms_fTimeStepNonClipped / 50.0f; }
static float GetTimeStepNonClippedInMilliseconds(void) { return ms_fTimeStepNonClipped / 50.0f * 1000.0f; }
@@ -56,6 +56,7 @@ public:
friend bool GenericLoad(void);
friend bool GenericSave(int file);
+ friend class CMemoryCard;
#ifdef FIX_BUGS
static float GetDefaultTimeStep(void) { return 50.0f / 30.0f; }