diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-13 16:08:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-13 16:08:57 -0500 |
| commit | 5dc85a079d9b18d95e655ebf5709530be41797f9 (patch) | |
| tree | 2a6c50b6fbb20d074cc6d526cb904b251166de7b /src/roulette_gfx.c | |
| parent | d067f0e6717908f4cb6d0c0ac9ba4fea8eb2cebe (diff) | |
| parent | aeebfee838222b9054da0632f2a65d2f934f7e23 (diff) | |
Merge pull request #742 from PikalaxALT/modern_gcc
Modern gcc
Diffstat (limited to 'src/roulette_gfx.c')
| -rw-r--r-- | src/roulette_gfx.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/roulette_gfx.c b/src/roulette_gfx.c index afcb94df6..83e5fb149 100644 --- a/src/roulette_gfx.c +++ b/src/roulette_gfx.c @@ -1502,7 +1502,7 @@ void sub_8118F8C(struct Sprite *sprite) const struct StructgUnknown_083F8DF4 *p; eRoulette->var90 = 0.0f; p = gUnknown_083F8DF4; - eRoulette->var8C -= ((float)p[eRoulette->var04_0].var03) + eRoulette->var8C -= ((float)(p[eRoulette->var04_0].var03)) / ((float)(s16)(p[eRoulette->var04_0].var04 + 1)); sprite->data[1] = 4; #if DEBUG @@ -1532,8 +1532,8 @@ void sub_8119088(struct Sprite *sprite) sub_8118724(sprite); if (!(eRoulette->var94 > 40.f)) { - eRoulette->var98 = - ( 4.0f / (float)(u16)eRoulette->var86); - eRoulette->var90 = - (eRoulette->var8C / (float)(u16)eRoulette->var86); + eRoulette->var98 = - ( 4.0f / (float)((u16)eRoulette->var86)); + eRoulette->var90 = - (eRoulette->var8C / (float)((u16)eRoulette->var86)); sprite->animNum = 2; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; @@ -1548,8 +1548,8 @@ void sub_8119134(struct Sprite *sprite) if (!(eRoulette->var94 > 60.0f)) { m4aSongNumStartOrChange(SE_TAMAKORO_E); - eRoulette->var98 = - ( 20.0f / (float)(u16)eRoulette->var84); - eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)(u16)eRoulette->var84); + eRoulette->var98 = - ( 20.0f / (float)((u16)eRoulette->var84)); + eRoulette->var90 = ((1.0f - eRoulette->var8C) / (float)((u16)eRoulette->var84)); sprite->animNum = 1; sprite->animBeginning = TRUE; sprite->animEnded = FALSE; |