mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

matched Math3D_CylVsLineSeg and fixed a Math_ error (#564)

Browse source 
* matched cylvsline

* slight name adjustment

* format

* and asm

* comment cleanup

* fixed misspelling and added mathfixer tool

* formatting

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2020-12-27 10:13:38 -06:00 • committed by GitHub
parent b95643b397
commit 3727cc38b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 382 additions and 1048 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
View file

@ -301,8 +301,7 @@ void EnSsh_Turn(EnSsh* this, GlobalContext* globalCtx) {
void EnSsh_Stunned(EnSsh* this, GlobalContext* globalCtx) {
if ((this->swayTimer == 0) && (this->stunTimer == 0)) {
Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink ^ 0x8000, 4, this->maxTurnRate,
1);
Math_SmoothStepToS(&this->actor.posRot.rot.y, this->actor.yawTowardsLink ^ 0x8000, 4, this->maxTurnRate, 1);
}
this->actor.shape.rot.y = this->actor.posRot.rot.y;
if (this->stunTimer < 30) {