diff options
| author | Pepe20129 <72659707+Pepe20129@users.noreply.github.com> | 2024-10-17 20:55:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 11:55:31 -0700 |
| commit | b5c6545d6f97b7762aa3f0cc308c2b0e6ec9fd84 (patch) | |
| tree | 176c9870f3587de7362f2537e7abd006ef4814b6 /soh/src/code/z_parameter.c | |
| parent | 3c5d9faba38346d1aa3355d14cce3b8286f1290b (diff) | |
`z_player` documentation 2024-10-11 (#4407)
* Add names to start of typedefs
* Idle stuff
* 2 functions
* Player state flags
* Name functions + misc
* ActionChange => ActionHandler
* Some player unks
* More player unks
* Header misc
* Misc
* More misc
* Player Actions
* Missed comments
* Move ship specific stuff
* Fix build
* CsCmdActorAction to CsCmdActorCue
* Fix build
Diffstat (limited to 'soh/src/code/z_parameter.c')
| -rw-r--r-- | soh/src/code/z_parameter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 29f7430eb..10b2953ec 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -4051,7 +4051,7 @@ void Interface_DrawEnemyHealthBar(TargetContext* targetCtx, PlayState* play) { Interface_CreateQuadVertexGroup(&sEnemyHealthVtx[12], -floorf(halfBarWidth) + endTexWidth, (-texHeight / 2) + 3, healthBarFill, 7, 0); - if (((!(player->stateFlags1 & PLAYER_STATE1_TEXT_ON_SCREEN)) || (actor != player->unk_664)) && targetCtx->unk_44 < 500.0f) { + if (((!(player->stateFlags1 & PLAYER_STATE1_TALKING)) || (actor != player->focusActor)) && targetCtx->unk_44 < 500.0f) { f32 slideInOffsetY = 0; // Slide in the health bar from edge of the screen (mimic the Z-Target triangles fly in) |