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

Macros: PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) (#921)

Browse source 
* PLAYER -> GET_PLAYER(globalCtx)

* ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* PR Suggestions

* formatter

* Add brackets

* remove from actorfixer.py

* Bring back actorfixer.py change
This commit is contained in:
engineer124 2021-08-31 20:22:03 +10:00 • committed by GitHub
parent f8498478c4
commit 1117783731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
281 changed files with 1013 additions and 979 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -123,7 +123,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) {
alpha = Math_SinS(sTransformationEffectAlpha) * 250;
alpha = CLAMP(alpha, 0, 255);
Camera_GetCamDir(&camDir, ACTIVE_CAM);
Camera_GetCamDir(&camDir, GET_ACTIVE_CAM(globalCtx));
Matrix_RotateY(camDir.y * (M_PI / 0x8000), MTXMODE_NEW);
Matrix_RotateX(camDir.x * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateZ(camDir.z * (M_PI / 0x8000), MTXMODE_APPLY);
@ -217,7 +217,7 @@ void EnButte_SetupFlyAround(EnButte* this) {
void EnButte_FlyAround(EnButte* this, GlobalContext* globalCtx) {
EnButteFlightParams* flightParams = &sFlyAroundParams[this->flightParamsIdx];
s16 yaw;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 distSqFromHome;
f32 maxDistSqFromHome;
f32 minAnimSpeed;
@ -292,7 +292,7 @@ void EnButte_SetupFollowLink(EnButte* this) {
void EnButte_FollowLink(EnButte* this, GlobalContext* globalCtx) {
static s32 D_809CE410 = 1500;
EnButteFlightParams* flightParams = &sFollowLinkParams[this->flightParamsIdx];
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 distSqFromHome;
Vec3f swordTip;
f32 animSpeed;
@ -399,7 +399,7 @@ void EnButte_Update(Actor* thisx, GlobalContext* globalCtx) {
this->unk_260 += 0x600;
if ((this->actor.params & 1) == 1) {
if (PLAYER->swordState == 0) {
if (GET_PLAYER(globalCtx)->swordState == 0) {
if (this->swordDownTimer > 0) {
this->swordDownTimer--;
}