diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-11-28 01:00:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 11:00:23 -0300 |
| commit | 2f1f0bdaefd63cf7da0598b988b6d4415c206071 (patch) | |
| tree | a8110a83ce290119cba96dddcec127b46ba5a79b /src/code | |
| parent | ba693efb0820f354df2b95a136ffc283639c0bf8 (diff) | |
Document Minimap Icon Actor Flag (#1747)
* minimap flag
* improve comment
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_map_disp.c | 7 | ||||
| -rw-r--r-- | src/code/z_player_call.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/code/z_map_disp.c b/src/code/z_map_disp.c index e9b6c96bb..2718160ec 100644 --- a/src/code/z_map_disp.c +++ b/src/code/z_map_disp.c @@ -276,7 +276,7 @@ void MapDisp_Minimap_DrawActorIcon(PlayState* play, Actor* actor) { if ((posX > 0) && (posX < 0x3FF) && (posY > 0) && (posY < 0x3FF)) { OPEN_DISPS(play->state.gfxCtx); - if ((actor->category == ACTORCAT_PLAYER) && (actor->flags & ACTOR_FLAG_80000000)) { + if ((actor->category == ACTORCAT_PLAYER) && (actor->flags & ACTOR_FLAG_MINIMAP_ICON_ENABLED)) { s16 compassRot; Gfx_SetupDL42_Overlay(play->state.gfxCtx); @@ -316,7 +316,7 @@ void MapDisp_Minimap_DrawActorIcon(PlayState* play, Actor* actor) { } else { Gfx_SetupDL39_Overlay(play->state.gfxCtx); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if (actor->flags & ACTOR_FLAG_80000000) { + if (actor->flags & ACTOR_FLAG_MINIMAP_ICON_ENABLED) { gDPSetPrimColor(OVERLAY_DISP++, 0, 0, sMinimapActorCategoryColors[actor->category].r, sMinimapActorCategoryColors[actor->category].g, sMinimapActorCategoryColors[actor->category].b, play->interfaceCtx.minimapAlpha); @@ -345,7 +345,8 @@ void MapDisp_Minimap_DrawActors(PlayState* play) { while (actor != NULL) { if ((actor->update != NULL) && (actor->init == NULL) && Object_IsLoaded(&play->objectCtx, actor->objectSlot) && - ((actor->id == ACTOR_EN_BOX) || (i == ACTORCAT_PLAYER) || (actor->flags & ACTOR_FLAG_80000000)) && + ((actor->id == ACTOR_EN_BOX) || (i == ACTORCAT_PLAYER) || + (actor->flags & ACTOR_FLAG_MINIMAP_ICON_ENABLED)) && ((sMapDisp.curRoom == actor->room) || (actor->room == -1))) { MapDisp_Minimap_DrawActorIcon(play, actor); } diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index d426190c3..e301cf48e 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -3,7 +3,7 @@ #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES | ACTOR_FLAG_80000000) + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES | ACTOR_FLAG_MINIMAP_ICON_ENABLED) ActorFunc sPlayerCallInitFunc; ActorFunc sPlayerCallDestroyFunc; |