diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/sys_math3d.c | 2 | ||||
| -rw-r--r-- | src/code/z_actor.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index a3b8ca2d6..6525f825d 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -3,7 +3,7 @@ // For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist // must be 0. -#pragma increment_block_number 190 +#pragma increment_block_number 187 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 5e8b86aaa..ec8475535 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -433,7 +433,8 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl unkActor = NULL; - if ((player->unk_664 != NULL) && (player->unk_84B[player->unk_846] == 2)) { + if ((player->unk_664 != NULL) && + (player->controlStickDirections[player->controlStickDataIndex] == PLAYER_STICK_DIR_BACKWARD)) { targetCtx->unk_94 = NULL; } else { func_80032AF0(play, &play->actorCtx, &unkActor, player); |