From 2e4bced7f9064167c5d7cf4d05583350baa058eb Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Sun, 15 Nov 2020 20:48:19 +1100 Subject: [PATCH] - buildutils: Replace `sintable[]` use within SW's hornet.cpp with `bsin()`/`bcos()`. --- source/sw/src/hornet.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/sw/src/hornet.cpp b/source/sw/src/hornet.cpp index 43406027f..dabd3848a 100644 --- a/source/sw/src/hornet.cpp +++ b/source/sw/src/hornet.cpp @@ -409,7 +409,7 @@ int DoHornetMatchPlayerZ(short SpriteNum) u->sz = max(u->sz, hiz + u->ceiling_dist); u->Counter = (u->Counter + (ACTORMOVETICS << 3) + (ACTORMOVETICS << 1)) & 2047; - sp->z = u->sz + ((HORNET_BOB_AMT * (int)sintable[u->Counter]) >> 14); + sp->z = u->sz + mulscale14(HORNET_BOB_AMT, bsin(u->Counter)); bound = u->hiz + u->ceiling_dist + HORNET_BOB_AMT; if (sp->z < bound) @@ -461,8 +461,8 @@ int DoHornetCircle(short SpriteNum) sp->ang = NORM_ANGLE(sp->ang + u->Counter2); - nx = sp->xvel * (int) sintable[NORM_ANGLE(sp->ang + 512)] >> 14; - ny = sp->xvel * (int) sintable[sp->ang] >> 14; + nx = mulscale14(sp->xvel, bcos(sp->ang)); + ny = mulscale14(sp->xvel, bsin(sp->ang)); if (!move_actor(SpriteNum, nx, ny, 0L)) { @@ -471,8 +471,8 @@ int DoHornetCircle(short SpriteNum) // try moving in the opposite direction u->Counter2 = -u->Counter2; sp->ang = NORM_ANGLE(sp->ang + 1024); - nx = sp->xvel * (int) sintable[NORM_ANGLE(sp->ang + 512)] >> 14; - ny = sp->xvel * (int) sintable[sp->ang] >> 14; + nx = mulscale14(sp->xvel, bcos(sp->ang)); + ny = mulscale14(sp->xvel, bsin(sp->ang)); if (!move_actor(SpriteNum, nx, ny, 0L)) { @@ -531,8 +531,8 @@ DoHornetDeath(short SpriteNum) DoActorSlide(SpriteNum); // slide while falling - nx = sp->xvel * (int) sintable[NORM_ANGLE(sp->ang + 512)] >> 14; - ny = sp->xvel * (int) sintable[sp->ang] >> 14; + nx = mulscale14(sp->xvel, bcos(sp->ang)); + ny = mulscale14(sp->xvel, bsin(sp->ang)); u->ret = move_sprite(SpriteNum, nx, ny, 0L, u->ceiling_dist, u->floor_dist, 1, ACTORMOVETICS);