mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-02 22:14:33 +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_Encount2/z_en_encount2.c
View file

@ -65,7 +65,7 @@ void EnEncount2_Wait(EnEncount2* this, GlobalContext* globalCtx) {
s32 pad;
s16 quakeIndex;
s16 spawnerState;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
spawnerState = ENCOUNT2_INACTIVE;
if (!this->isNotDeathMountain) {
@ -93,7 +93,7 @@ void EnEncount2_Wait(EnEncount2* this, GlobalContext* globalCtx) {
break;
case ENCOUNT2_ACTIVE_DEATH_MOUNTAIN:
if ((this->deathMountainSpawnerTimer == 1) || (!this->isQuaking)) {
quakeIndex = Quake_Add(ACTIVE_CAM, 1);
quakeIndex = Quake_Add(GET_ACTIVE_CAM(globalCtx), 1);
Quake_SetSpeed(quakeIndex, 0x7FFF);
Quake_SetQuakeValues(quakeIndex, 50, 0, 0, 0);
Quake_SetCountdown(quakeIndex, 300);
@ -115,7 +115,7 @@ void EnEncount2_Wait(EnEncount2* this, GlobalContext* globalCtx) {
}
void EnEncount2_SpawnRocks(EnEncount2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
EnFireRock* spawnedRock;
f32 tempVec1X;
f32 tempVec1Y;
@ -311,7 +311,7 @@ void EnEncount2_ParticleInit(EnEncount2* this, Vec3f* particlePos, f32 scale) {
void EnEncount2_ParticleUpdate(EnEncount2* this, GlobalContext* globalCtx) {
s16 i;
EnEncount2Particle* particle = this->particles;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Vec3f targetPos;
for (i = 0; i < ARRAY_COUNT(this->particles); particle++, i++) {