summaryrefslogtreecommitdiff
path: root/gflib/sprite.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-29 20:56:15 -0400
committerGitHub <noreply@github.com>2021-03-29 20:56:15 -0400
commit50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch)
treeb1543b6d79695862cb60d686548dd1a996b69e8c /gflib/sprite.c
parentdea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff)
parente8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff)
Merge branch 'master' into doc-introcred
Diffstat (limited to 'gflib/sprite.c')
-rw-r--r--gflib/sprite.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/gflib/sprite.c b/gflib/sprite.c
index 764ead3d3..c66b1e47d 100644
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
@@ -1329,12 +1329,7 @@ void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnim
s16 ConvertScaleParam(s16 scale)
{
s32 val = 0x10000;
- // UB: possible division by zero
-#ifdef UBFIX
- if (scale == 0)
- return 0;
-#endif //UBFIX
- return val / scale;
+ return SAFE_DIV(val, scale);
}
void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd)