From dd6eaeb148a6b80990dafa41c60e708ceb180ea5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 23 Nov 2022 19:13:36 +1000 Subject: [PATCH] Fix compile errors in gcc --- src/game/mtxf2lbulk.c | 32 ++++++++++++++++---------------- src/lib/mtxc.c | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/game/mtxf2lbulk.c b/src/game/mtxf2lbulk.c index e39167f3f..a961a2e5c 100644 --- a/src/game/mtxf2lbulk.c +++ b/src/game/mtxf2lbulk.c @@ -25,22 +25,22 @@ void mtxF2LBulk(Mtxf *mtx, s32 count) u32 m32 = (s32) (mtx->m[3][2] * var8005ef10[0]); u32 m33 = (s32) (mtx->m[3][3] * var8005ef10[1]); - mtx->l[0][0] = (m00 & 0xffff0000 | m01 >> 16); - mtx->l[0][1] = (m02 & 0xffff0000 | m03 >> 16); - mtx->l[0][2] = (m10 & 0xffff0000 | m11 >> 16); - mtx->l[0][3] = (m12 & 0xffff0000 | m13 >> 16); - mtx->l[1][0] = (m20 & 0xffff0000 | m21 >> 16); - mtx->l[1][1] = (m22 & 0xffff0000 | m23 >> 16); - mtx->l[1][2] = (m30 & 0xffff0000 | m31 >> 16); - mtx->l[1][3] = (m32 & 0xffff0000 | m33 >> 16); - mtx->l[2][0] = (m00 << 16 | m01 & 0xffff); - mtx->l[2][1] = (m02 << 16 | m03 & 0xffff); - mtx->l[2][2] = (m10 << 16 | m11 & 0xffff); - mtx->l[2][3] = (m12 << 16 | m13 & 0xffff); - mtx->l[3][0] = (m20 << 16 | m21 & 0xffff); - mtx->l[3][1] = (m22 << 16 | m23 & 0xffff); - mtx->l[3][2] = (m30 << 16 | m31 & 0xffff); - mtx->l[3][3] = (m32 << 16 | m33 & 0xffff); + mtx->l[0][0] = (m00 & 0xffff0000) | m01 >> 16; + mtx->l[0][1] = (m02 & 0xffff0000) | m03 >> 16; + mtx->l[0][2] = (m10 & 0xffff0000) | m11 >> 16; + mtx->l[0][3] = (m12 & 0xffff0000) | m13 >> 16; + mtx->l[1][0] = (m20 & 0xffff0000) | m21 >> 16; + mtx->l[1][1] = (m22 & 0xffff0000) | m23 >> 16; + mtx->l[1][2] = (m30 & 0xffff0000) | m31 >> 16; + mtx->l[1][3] = (m32 & 0xffff0000) | m33 >> 16; + mtx->l[2][0] = m00 << 16 | (m01 & 0xffff); + mtx->l[2][1] = m02 << 16 | (m03 & 0xffff); + mtx->l[2][2] = m10 << 16 | (m11 & 0xffff); + mtx->l[2][3] = m12 << 16 | (m13 & 0xffff); + mtx->l[3][0] = m20 << 16 | (m21 & 0xffff); + mtx->l[3][1] = m22 << 16 | (m23 & 0xffff); + mtx->l[3][2] = m30 << 16 | (m31 & 0xffff); + mtx->l[3][3] = m32 << 16 | (m33 & 0xffff); mtx++; diff --git a/src/lib/mtxc.c b/src/lib/mtxc.c index 1220b1cab..caa52d64d 100644 --- a/src/lib/mtxc.c +++ b/src/lib/mtxc.c @@ -333,21 +333,21 @@ void mtx00016054(Mtxf *src, Mtxf *dst) u32 src32 = (s32) (src->m[3][2] * var8005ef10[0]); u32 src33 = (s32) (src->m[3][3] * var8005ef10[1]); - dst->l[0][0] = src00 & 0xffff0000 | src01 >> 16; - dst->l[0][1] = src02 & 0xffff0000 | src03 >> 16; - dst->l[0][2] = src10 & 0xffff0000 | src11 >> 16; - dst->l[0][3] = src12 & 0xffff0000 | src13 >> 16; - dst->l[1][0] = src20 & 0xffff0000 | src21 >> 16; - dst->l[1][1] = src22 & 0xffff0000 | src23 >> 16; - dst->l[1][2] = src30 & 0xffff0000 | src31 >> 16; - dst->l[1][3] = src32 & 0xffff0000 | src33 >> 16; + dst->l[0][0] = (src00 & 0xffff0000) | src01 >> 16; + dst->l[0][1] = (src02 & 0xffff0000) | src03 >> 16; + dst->l[0][2] = (src10 & 0xffff0000) | src11 >> 16; + dst->l[0][3] = (src12 & 0xffff0000) | src13 >> 16; + dst->l[1][0] = (src20 & 0xffff0000) | src21 >> 16; + dst->l[1][1] = (src22 & 0xffff0000) | src23 >> 16; + dst->l[1][2] = (src30 & 0xffff0000) | src31 >> 16; + dst->l[1][3] = (src32 & 0xffff0000) | src33 >> 16; - dst->l[2][0] = src00 << 16 | src01 & 0xffff; - dst->l[2][1] = src02 << 16 | src03 & 0xffff; - dst->l[2][2] = src10 << 16 | src11 & 0xffff; - dst->l[2][3] = src12 << 16 | src13 & 0xffff; - dst->l[3][0] = src20 << 16 | src21 & 0xffff; - dst->l[3][1] = src22 << 16 | src23 & 0xffff; - dst->l[3][2] = src30 << 16 | src31 & 0xffff; - dst->l[3][3] = src32 << 16 | src33 & 0xffff; + dst->l[2][0] = src00 << 16 | (src01 & 0xffff); + dst->l[2][1] = src02 << 16 | (src03 & 0xffff); + dst->l[2][2] = src10 << 16 | (src11 & 0xffff); + dst->l[2][3] = src12 << 16 | (src13 & 0xffff); + dst->l[3][0] = src20 << 16 | (src21 & 0xffff); + dst->l[3][1] = src22 << 16 | (src23 & 0xffff); + dst->l[3][2] = src30 << 16 | (src31 & 0xffff); + dst->l[3][3] = src32 << 16 | (src33 & 0xffff); }