mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

4
src/overlays/actors/ovl_En_Vali/z_en_vali.c
View file

@ -291,8 +291,8 @@ void EnVali_DischargeLightning(EnVali* this, GlobalContext* globalCtx) {
s16 yaw;
for (i = 0; i < 4; i++) {
cos = -Math_CosS(Camera_GetCamDirYaw(ACTIVE_CAM));
sin = Math_SinS(Camera_GetCamDirYaw(ACTIVE_CAM));
cos = -Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)));
sin = Math_SinS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)));
if (!((this->lightningTimer + (i << 1)) % 4)) {
yaw = (s16)Rand_CenteredFloat(12288.0f) + (i * 0x4000) + 0x2000;
pos.x = this->actor.world.pos.x + (Math_SinS(yaw) * 12.0f * cos);