MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-07-02 09:03:36 +00:00
Code Releases Wiki Activity

bf wrong framerate constant #171 #169

Browse Source
This commit is contained in:
Blake Warner 2022-02-20 08:08:19 -05:00
parent 12163e9663
commit ca419a7934
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/framerate.h
View File

@ -78,13 +78,13 @@ struct Frame
{ {
} }
explicit constexpr Frame(const T& n) : m_counter(n * (FRAMERATE_MAX / 20)) explicit constexpr Frame(const T& n) : m_counter(n * (FRAME_RATE / 20))
{ {
} }
Frame<T> operator=(const T& n) Frame<T> operator=(const T& n)
{ {
m_counter = n * (FRAMERATE_MAX / 20); m_counter = n * (FRAME_RATE / 20);
return *this; return *this;
} }
@ -100,12 +100,12 @@ struct Frame
T whole() const T whole() const
{ {
return m_counter / (FRAMERATE_MAX / 20); return m_counter / (FRAME_RATE / 20);
} }
T fraction() const T fraction() const
{ {
return m_counter % (FRAMERATE_MAX / 20); return m_counter % (FRAME_RATE / 20);
} }
bool operator==(Frame n) const bool operator==(Frame n) const
@ -326,7 +326,7 @@ struct Frame
float toFloat() const float toFloat() const
{ {
return (float)whole() + ((float)fraction() / ((float)FRAMERATE_MAX / 20.0f)); return (float)whole() + ((float)fraction() / ((float)FRAME_RATE / 20.0f));
} }
s8 toS8() const s8 toS8() const