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

Rename yDistToWater -> depthInWater (#1950)

Browse source 
* Rename yDistToWater -> yDistUnderWater

* yDistUnderWater -> depthInWater
This commit is contained in:
cadmic 2024-04-28 14:29:06 -07:00 • committed by GitHub
parent d4d7512cb6
commit b86e1774cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 112 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -429,7 +429,7 @@ void EnRu1_SpawnRipple(EnRu1* this, PlayState* play, s16 radiusMax, s16 life) {
Actor* thisx = &this->actor;
pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + this->actor.yDistToWater;
pos.y = this->actor.world.pos.y + this->actor.depthInWater;
pos.z = this->actor.world.pos.z;
EffectSsGRipple_Spawn(play, &pos, 100, radiusMax, life);
}
@ -452,7 +452,7 @@ void EnRu1_SpawnSplash(EnRu1* this, PlayState* play) {
Vec3f pos;
pos.x = this->actor.world.pos.x;
pos.y = this->actor.world.pos.y + this->actor.yDistToWater;
pos.y = this->actor.world.pos.y + this->actor.depthInWater;
pos.z = this->actor.world.pos.z;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 1, 0);
@ -1230,7 +1230,7 @@ s32 func_80AED624(EnRu1* this, PlayState* play) {
Actor_Kill(&this->actor);
return false;
} else if (((this->roomNum1 != curRoomNum) || (this->roomNum2 != curRoomNum)) &&
(this->actor.yDistToWater > kREG(16) + 50.0f) && (this->action != 33)) {
(this->actor.depthInWater > kREG(16) + 50.0f) && (this->action != 33)) {
this->action = 33;
this->drawConfig = 2;
this->alpha = 0xFF;
@ -1460,7 +1460,7 @@ void func_80AEE050(EnRu1* this) {
this->unk_350 = 1;
func_80AEE02C(this);
this->unk_35C = 0;
this->unk_358 = (this->actor.yDistToWater - 10.0f) * 0.5f;
this->unk_358 = (this->actor.depthInWater - 10.0f) * 0.5f;
this->unk_354 = this->actor.world.pos.y + thisx->unk_358; // thisx only used here
} else {
this->actor.gravity = 0.0f;
@ -1593,7 +1593,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) {
return;
}
if (this->actor.yDistToWater > 0.0f) {
if (this->actor.depthInWater > 0.0f) {
this->action = 29;
this->unk_350 = 0;
}