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
07th-mod · Mar 17, 2024 · e9306f7 · e9306f7
1 parent 69d3807
commit e9306f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Update/wata_003.txt b/Update/wata_003.txt
@@ -4190,10 +4190,10 @@ void main()
 		   NULL, " Rice Culture!!!!!\"", Line_Continue);
 	DisableWindow();
 	DrawScene("white", 10 );
-	DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE );
+	DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, TRUE ); //ERROR_EXISTING: Priority 10 on layer 5 used here. Conflict is 3 lines away (line 4196)
 	PlaySE( 3, "wa_007", 56, 64 );
 	ShakeScreen( 1, 50, 20, 3, 0, );
-	ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
+	ModDrawCharacter(2, 22, "sprite/tie_2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 3 lines ago (line 4193). Existing Layer: 5 Conflicting Layer: 2 Suggested Priority: 11
 	DrawSceneWithMask("background/gr1", "up", 0, 0, 800 );
 
 	OutputLineAll(NULL, "", GetGlobalFlag(GLinemodeSp));

diff --git a/Update/wata_005.txt b/Update/wata_005.txt
@@ -3620,7 +3620,7 @@ void main()
 
 	DisableWindow();
 	ModSetLayerFilter(3, 256, "none");
-	ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
+	ModDrawCharacterWithFiltering(3, 2, "sprite/re2b_kaii_b1_", "2", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); //ERROR_EXISTING: Priority 10 on layer 3 used here. Conflict is 37 lines away (line 3660)
 
 //　レナがふらふらと現れ、彼らに注意（？）する￥
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -3657,7 +3657,7 @@ void main()
 	ClearMessage();
 	DisableWindow();
 	ModSetLayerFilter(2, 256, "none");
-	ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 100, FALSE );
+	ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 100, FALSE ); //ERROR: Priority 10 already in use 37 lines ago (line 3623). Existing Layer: 3 Conflicting Layer: 2 Suggested Priority: 11
 	DrawScene("background/res1", 300 );
 
 //「さすがはレナさん...＠...いつ見ても恐ろしいキレですわね。＠

diff --git a/Update/wata_010_03.txt b/Update/wata_010_03.txt
@@ -2541,8 +2541,8 @@ void main()
 
 	DisableWindow();
 
-	ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
-	DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
+	ModDrawCharacter(2, 3, "portrait/me2_hig_maji_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE ); //ERROR_EXISTING: Priority 10 on layer 2 used here. Conflict is 1 lines away (line 2545)
+	DrawBustshot(1, "e1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 11, 0, FALSE ); //ERROR: Priority 10 already in use 1 lines ago (line 2544). Existing Layer: 2 Conflicting Layer: 1 Suggested Priority: 11
 
 	DrawSceneWithMask("background/yhu2", "up", 0, 0, 300 );
 //	DrawBustshotWithFiltering( 3, "e1", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );