diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-06-06 08:54:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 08:54:18 -0400 |
| commit | a0701c170b5861572eab29bc9f0aed92aa0e11d9 (patch) | |
| tree | 6c058b279148e7d76e8a586c3bc4d5e1f5f183de /src/code | |
| parent | 4cce44466170344b68b146cfbec6d9597d0910bb (diff) | |
`z64game.h` (#1250)
* z64game.h
* grrrrr
* fix missing stuff
* Update include/z64game.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update include/z64game.h
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* review
* global.h to the top
* reiew
* fix
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/game.c | 6 | ||||
| -rw-r--r-- | src/code/z_prenmi.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/code/game.c b/src/code/game.c index c98241177..8f4e0f44d 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -11,9 +11,9 @@ f32 gFramerateDivisorThird = 1.0f / 3.0f; void Game_UpdateFramerateVariables(s32 divisor) { gFramerateDivisor = divisor; - gFramerateDivisorF = (f32)divisor; - gFramerateDivisorHalf = (f32)(divisor * 0.5f); - gFramerateDivisorThird = (f32)(divisor / 3.0f); + gFramerateDivisorF = divisor; + gFramerateDivisorHalf = divisor / 2.0f; + gFramerateDivisorThird = divisor / 3.0f; } void Game_SetFramerateDivisor(GameState* gameState, s32 divisor) { diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 94d235a37..097d4d946 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -1,3 +1,4 @@ +#include "global.h" #include "z_prenmi.h" void PreNMI_Stop(PreNMIState* this) { @@ -9,10 +10,9 @@ void PreNMI_Update(PreNMIState* this) { if (this->timer == 0) { ViConfig_UpdateVi(1); PreNMI_Stop(this); - return; + } else { + this->timer--; } - - this->timer--; } void PreNMI_Draw(PreNMIState* this) { @@ -48,7 +48,7 @@ void PreNMI_Init(GameState* thisx) { this->state.main = PreNMI_Main; this->state.destroy = PreNMI_Destroy; this->timer = 30; - this->unkA8 = 10; + this->unk_A8 = 10; Game_SetFramerateDivisor(&this->state, 1); } |