diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-10-13 03:27:29 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 13:27:29 -0300 |
| commit | 3aeadb42b8a195b3d2f67ce71fcd184ddf26d856 (patch) | |
| tree | 9b7ae22819651306b4bd8c59f2384ac84c15de99 /src/code/z_quake.c | |
| parent | 4c43661cf34544a6ffc6817912021de5679e8f42 (diff) | |
Macros: `PLAYER` -> `GET_PLAYER(globalCtx)` and `ACTIVE_CAM` -> `GET_ACTIVE_CAM(globalCtx)` (#283)
* PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)
* formatter
* PR Suggestions
* `FIRST_ENEMY` -> `GET_FIRST_ENEMY(globalCtx)`
* Fix merge conflicts
Diffstat (limited to 'src/code/z_quake.c')
| -rw-r--r-- | src/code/z_quake.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/z_quake.c b/src/code/z_quake.c index b45e02381..aeb8370ab 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -444,7 +444,7 @@ void Quake2_Update(void) { Player* player; GlobalContext* globalCtx = sQuake2Context.globalCtx; PosRot playerPosRot; - Camera* camera = globalCtx->cameraPtrs[globalCtx->activeCamera]; + Camera* camera = GET_ACTIVE_CAM(globalCtx); f32 speedRatio = CLAMP_MAX(camera->speedRatio, 1.0f); if (sQuake2Context.type != 0) { @@ -605,7 +605,7 @@ void Quake2_Update(void) { angle1 = 0x3F0; angle2 = 0x156; sQuake2Context.countdown = 2; - player = PLAYER; + player = GET_PLAYER(globalCtx); if (&player->actor != NULL) { func_800B8248(&playerPosRot, player); @@ -654,7 +654,7 @@ void Quake2_Update(void) { angle1 = 0x3F0; angle2 = 0x156; sQuake2Context.countdown = 2; - player = PLAYER; + player = GET_PLAYER(globalCtx); angle1Speed = 359.2f; angle2Speed = -18.5f; rotX = 0.0f; |