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

Generic actor params getters (#1359)

Browse source 
* Initial PARAMS_GET macros

* NOSHIFT macro

* Use number of bits rather than raw mask values

* Add descriptions for each generic macro

* Reformat

* Adjust comment

* format

* edit en_door macro names

* edit redead macro name

* edit bdan switch macro name, and remove unneeded comments in go2

* mizushutter macro names

* remove PARAMS_GET_S, rework ishi switch flag handling

* actually remove PARAMS_GET_S

* remove PARAMS_GET2_S

* PARAMS_GET_U and PARAMS_GET_S

* format

* fix merge

* format

---------

Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
Tharo 2024-08-14 20:29:43 +01:00 • committed by GitHub
parent 137e0d2a10
commit eaf955ad22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
200 changed files with 1113 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -136,7 +136,7 @@ void MirRay_MakeShieldLight(MirRay* this, PlayState* play) {
player->actor.world.pos.y + 30.0f, player->actor.world.pos.z, this->sourceEndRad,
this->poolEndRad)) {
if (dataEntry->params & 8) { // Light beams from mirrors
if (PARAMS_GET_NOSHIFT(dataEntry->params, 3, 1)) { // Light beams from mirrors
Math_Vec3f_Diff(&player->actor.world.pos, &this->sourcePt, &reflectionPt);
} else { // Light beams from windows
Math_Vec3f_Diff(&this->poolPt, &this->sourcePt, &reflectionPt);
@ -207,10 +207,10 @@ void MirRay_Init(Actor* thisx, PlayState* play) {
this->shieldCorners[5].x = 758.0f;
this->shieldCorners[5].y = -800.0f;
if (dataEntry->params & 2) {
if (PARAMS_GET_NOSHIFT(dataEntry->params, 1, 1)) {
Collider_InitJntSph(play, &this->colliderSph);
Collider_SetJntSph(play, &this->colliderSph, &this->actor, &sJntSphInit, &this->colliderSphItem);
if (!(dataEntry->params & 4)) { // Beams not from mirrors
if (!PARAMS_GET_NOSHIFT(dataEntry->params, 2, 1)) { // Beams not from mirrors
MirRay_SetupCollider(this);
}
}