summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinspectredc <78732756+inspectredc@users.noreply.github.com>2024-06-11 02:02:25 +0100
committerGitHub <noreply@github.com>2024-06-10 18:02:25 -0700
commitfdd3f173859a63ac6779eae2e9dffcf148607311 (patch)
tree7221f58dc3f68fd0beda10b341ae7e03a3b5a3a8
parent34e326bc344b2a7be9d40cbbdf6367e0956a99f6 (diff)
Fix LensMode Names (#1643)
-rw-r--r--include/z64actor.h4
-rw-r--r--src/code/z_actor.c6
-rw-r--r--src/overlays/actors/ovl_En_Test2/z_en_test2.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/include/z64actor.h b/include/z64actor.h
index 0de0dbcea..f043c5080 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -366,8 +366,8 @@ typedef struct ActorListEntry {
} ActorListEntry; // size = 0xC
typedef enum {
- /* 0 */ LENS_MODE_HIDE_ACTORS, // lens actors are visible by default, and hidden by using lens (for example, fake walls)
- /* 1 */ LENS_MODE_SHOW_ACTORS // lens actors are invisible by default, and shown by using lens (for example, invisible enemies)
+ /* 0 */ LENS_MODE_SHOW_ACTORS, // lens actors are invisible by default, and shown by using lens (for example, invisible enemies)
+ /* 1 */ LENS_MODE_HIDE_ACTORS // lens actors are visible by default, and hidden by using lens (for example, fake walls)
} LensMode;
#define LENS_ACTOR_MAX 32
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 8f08b3f31..5d31c31ac 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -2874,7 +2874,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numLensActors, Actor** lensActors
gDPSetPrimColor(gfx++, 0, 0, 0, 0, 0, 255);
- if (play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) {
+ if (play->roomCtx.curRoom.lensMode == LENS_MODE_SHOW_ACTORS) {
gDPSetCombineLERP(gfx++, 1, TEXEL0, PRIMITIVE, 0, 1, TEXEL0, PRIMITIVE, 0, 1, TEXEL0, PRIMITIVE, 0, 1,
TEXEL0, PRIMITIVE, 0);
} else {
@@ -2904,7 +2904,7 @@ void Actor_DrawLensActors(PlayState* play, s32 numLensActors, Actor** lensActors
gDPSetBlendColor(gfx++, 255, 255, 255, 0);
gDPSetPrimColor(gfx++, 0, 0xFF, 0, 0, 0, 32);
- if (play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) {
+ if (play->roomCtx.curRoom.lensMode == LENS_MODE_SHOW_ACTORS) {
gDPSetCombineMode(gfx++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM);
} else {
gDPSetCombineLERP(gfx++, 1, TEXEL0, PRIMITIVE, 0, 1, TEXEL0, PRIMITIVE, 0, 1, TEXEL0, PRIMITIVE, 0, 1,
@@ -3027,7 +3027,7 @@ void Actor_DrawAll(PlayState* play, ActorContext* actorCtx) {
actor->isDrawn = false;
if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & actorFlags)) {
if ((actor->flags & ACTOR_FLAG_REACT_TO_LENS) &&
- ((play->roomCtx.curRoom.lensMode == LENS_MODE_HIDE_ACTORS) ||
+ ((play->roomCtx.curRoom.lensMode == LENS_MODE_SHOW_ACTORS) ||
(play->actorCtx.lensMaskSize == LENS_MASK_ACTIVE_SIZE) ||
(actor->room != play->roomCtx.curRoom.num))) {
if (Actor_AddToLensActors(play, actor)) {}
diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c
index 649c6022f..fef410876 100644
--- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c
+++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c
@@ -96,7 +96,7 @@ void EnTest2_Update(Actor* thisx, PlayState* play) {
Actor_SetObjectDependency(play, &this->actor);
this->animMat = Lib_SegmentedToVirtual(modelInfo->animMat);
}
- if (play->roomCtx.curRoom.lensMode != LENS_MODE_HIDE_ACTORS) {
+ if (play->roomCtx.curRoom.lensMode != LENS_MODE_SHOW_ACTORS) {
this->actor.update = EnTest2_UpdateForLens;
} else {
this->actor.update = Actor_Noop;