summaryrefslogtreecommitdiff
path: root/gflib/sprite.c
diff options
context:
space:
mode:
authorSierraffinity <sierra@domoreaweso.me>2021-01-04 16:39:35 -0800
committerSierraffinity <sierra@domoreaweso.me>2021-01-04 16:39:47 -0800
commita982e6ab8887853eb6d8776485e5b1d80bd0c645 (patch)
tree5fa32526229c4d2262c38d9da922f5930bbee15e /gflib/sprite.c
parent67a656a4df326ebfcbca48c76efdc4fc39554093 (diff)
Make div by zero fix more concice
Diffstat (limited to 'gflib/sprite.c')
-rw-r--r--gflib/sprite.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/gflib/sprite.c b/gflib/sprite.c
index e36c53721..2616aeaed 100644
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
@@ -1319,18 +1319,13 @@ void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnim
s16 ConvertScaleParam(s16 scale)
{
- s16 ret;
s32 val = 0x10000;
// UB: possible division by zero
#ifdef UBFIX
- if (scale != 0)
- ret = val / scale;
- else
- ret = 0;
-#else
- ret = val / scale;
+ if (scale == 0)
+ return 0;
#endif //UBFIX
- return ret;
+ return val / scale;
}
void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd)