From 9a47989a344ad932c3be66c02ed370ad5ebe5022 Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 18 Mar 2024 20:29:27 +1100 Subject: [PATCH 1/2] Priority Fixes for review - Includes automatically fixed priority on lines with error - Please delete //ERROR_EXISTING: comments, those are just to indicate where priority was last used --- Update/staffroom.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/staffroom.txt b/Update/staffroom.txt index 7041923..3c306d1 100644 --- a/Update/staffroom.txt +++ b/Update/staffroom.txt @@ -409,7 +409,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); + ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); //ERROR_EXISTING: Priority 1 on layer 2 used here. Conflict is 13 lines away (line 425) if (GetGlobalFlag(GADVMode)) { OutputLine("八咫桜", NULL, "Yatazakura", NULL, Line_ContinueAfterTyping); } @@ -422,7 +422,7 @@ void main() DisableWindow(); FadeOutBGM( 0, 300, TRUE ); - ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE ); + ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 300, TRUE ); //ERROR: Priority 1 already in use 13 lines ago (line 412). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 2 PlayBGM( 0, "4", 120, 0 ); From 19454cb1aee044be6c9b12edec9cfe56b0e0844f Mon Sep 17 00:00:00 2001 From: Aurian Date: Mon, 18 Mar 2024 19:46:40 +0100 Subject: [PATCH 2/2] prio fix --- Update/staffroom.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update/staffroom.txt b/Update/staffroom.txt index 3c306d1..c4d7aa6 100644 --- a/Update/staffroom.txt +++ b/Update/staffroom.txt @@ -409,7 +409,7 @@ void main() ClearMessage(); DisableWindow(); - ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 1, 300, TRUE ); //ERROR_EXISTING: Priority 1 on layer 2 used here. Conflict is 13 lines away (line 425) + ModDrawCharacterWithFiltering(2, 11, "sprite/oisi2_6_", "0", "effect/left", 0, -160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); if (GetGlobalFlag(GADVMode)) { OutputLine("八咫桜", NULL, "Yatazakura", NULL, Line_ContinueAfterTyping); } @@ -422,7 +422,7 @@ void main() DisableWindow(); FadeOutBGM( 0, 300, TRUE ); - ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 2, 300, TRUE ); //ERROR: Priority 1 already in use 13 lines ago (line 412). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 2 + ModDrawCharacter(1, 14, "sprite/oko3_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 300, TRUE ); PlayBGM( 0, "4", 120, 0 );