diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-29 23:07:22 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-12-29 23:07:22 +0100 |
| commit | 242336c3851f33caa09af7ab332071d1ae9fb8bf (patch) | |
| tree | e7dfa362696260756c5585b90224fc2ac1291a5f /src/object/cameraTarget.c | |
| parent | 870c08fad6576a219deca4e6f6cc46634267248e (diff) | |
| parent | c2f081600bca5c3f1f82d7bac8bc5827faf0d17a (diff) | |
Merge branch 'master' into enemies
Diffstat (limited to 'src/object/cameraTarget.c')
| -rw-r--r-- | src/object/cameraTarget.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/cameraTarget.c b/src/object/cameraTarget.c index 9c001915..e21b2f7d 100644 --- a/src/object/cameraTarget.c +++ b/src/object/cameraTarget.c @@ -53,7 +53,7 @@ void CameraTarget(Entity* this) { case FUSION_STATE_0: case FUSION_STATE_1: case FUSION_STATE_2: - if ((gMessage.doTextBox & 0x7f) == 0) { + if ((gMessage.state & MESSAGE_ACTIVE) == 0) { break; } default: @@ -96,7 +96,7 @@ void CameraTarget_Init(Entity* this) { } this->action = 1; this->flags |= ENT_PERSIST; - SetDefaultPriority(this, 6); + SetEntityPriority(this, 6); } void CameraTarget_Action1(Entity* this) { |