mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Name movement related functions in z_actor (#1476)

Browse source 
* rename functions

* dragorns name suggestions

* Revert "dragorns name suggestions"

This reverts commit dd4626ce5e.

* lets try that again

* reword comment

* comments

* projectile speed

* arg name

* more comments

* minVelY comment

* merge master and format
This commit is contained in:
fig02 2022-12-30 13:55:14 -05:00 • committed by GitHub
parent 41e80b951b
commit e37b993483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
191 changed files with 349 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -941,7 +941,7 @@ void EnSt_ReturnToCeiling(EnSt* this, PlayState* play) {
*/
void EnSt_BounceAround(EnSt* this, PlayState* play) {
this->actor.colorFilterTimer = this->deathTimer;
func_8002D868(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
this->actor.world.rot.x += 0x800;
this->actor.world.rot.z -= 0x800;
this->actor.shape.rot = this->actor.world.rot;
@ -979,7 +979,7 @@ void EnSt_FinishBouncing(EnSt* this, PlayState* play) {
this->actor.shape.rot = this->actor.world.rot;
func_8002D868(&this->actor);
Actor_UpdateVelocityXZGravity(&this->actor);
this->groundBounces = 2;
EnSt_IsDoneBouncing(this, play);
}
@ -1023,7 +1023,7 @@ void EnSt_Update(Actor* thisx, PlayState* play) {
}
if (this->swayTimer == 0 && this->stunTimer == 0) {
func_8002D7EC(&this->actor);
Actor_UpdatePos(&this->actor);
}
Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_2);