From 0f7afa74017abb467aa8091fbd9b6a355c08a39e Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 12:54:21 +0200 Subject: [PATCH 1/6] Fixed comment formatting in BossOhm.cpp (intended to do this for all bosses but found nothing lol) (btw changed my regex to "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;)") Signed-off-by: Gabriel Ravier --- src/BossOhm.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp index 7a82b099..2df6aedd 100644 --- a/src/BossOhm.cpp +++ b/src/BossOhm.cpp @@ -183,7 +183,7 @@ void ActBossChar_Omega() gBoss[5].cond = 0x80; break; - case 20: //Rising out of the ground + case 20: // Rising out of the ground gBoss[0].act_no = 30; gBoss[0].act_wait = 0; gBoss[0].ani_no = 0; @@ -227,7 +227,7 @@ void ActBossChar_Omega() } break; - case 50: //Open mouth + case 50: // Open mouth if (++gBoss[0].count1 > 2) { gBoss[0].count1 = 0; @@ -244,7 +244,7 @@ void ActBossChar_Omega() } break; - case 60: //Shoot out of mouth + case 60: // Shoot out of mouth if (++gBoss[0].act_wait > 20 && gBoss[0].act_wait < 80 && !(gBoss[0].act_wait % 3)) { if (Random(0, 9) < 8) @@ -263,7 +263,7 @@ void ActBossChar_Omega() } break; - case 70: //Close mouth + case 70: // Close mouth if (++gBoss[0].count1 > 2) { gBoss[0].count1 = 0; @@ -299,7 +299,7 @@ void ActBossChar_Omega() } break; - case 90: //Go back into the ground + case 90: // Go back into the ground SetQuake(2); gBoss[0].y += 0x200; @@ -313,7 +313,7 @@ void ActBossChar_Omega() } break; - case 100: //Move to proper position for coming out of the ground + case 100: // Move to proper position for coming out of the ground if (++gBoss[0].act_wait == 120) { gBoss[0].act_wait = 0; From c7c40fa24a16685e87da1a278a0f44a5899ffa4f Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 14:31:06 +0200 Subject: [PATCH 2/6] Fixed comments and spacing in boss files Add spaces for comments Remove spaces in "( expr )" things Signed-off-by: Gabriel Ravier --- src/Boss.cpp | 4 ++-- src/BossAlmo1.cpp | 2 +- src/BossBallos.cpp | 2 +- src/BossTwinD.cpp | 2 +- src/BossX.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Boss.cpp b/src/Boss.cpp index ae6f1c80..3e5d8c66 100644 --- a/src/Boss.cpp +++ b/src/Boss.cpp @@ -97,7 +97,7 @@ void HitBossBullet() if (gBul[bul].damage == -1) continue; - //Check if bullet touches boss + // Check if bullet touches boss bHit = FALSE; if (gBoss[bos].bits & npc_shootable && gBoss[bos].x - gBoss[bos].hit.back < gBul[bul].x + gBul[bul].enemyXL @@ -114,7 +114,7 @@ void HitBossBullet() if (bHit) { - //Damage boss + // Damage boss if (gBoss[bos].bits & npc_shootable) { if (gBoss[bos].cond & 0x10) diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp index 2654c696..a9af1ffb 100644 --- a/src/BossAlmo1.cpp +++ b/src/BossAlmo1.cpp @@ -459,7 +459,7 @@ void ActBossChar_Core(void) PlaySoundObject(101, 1); } - if ( npc->act_wait > 400 ) + if (npc->act_wait > 400) { npc->act_no = 200; gBoss[4].ani_no = 2; diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp index c533edde..93920519 100644 --- a/src/BossBallos.cpp +++ b/src/BossBallos.cpp @@ -230,7 +230,7 @@ void ActBossChar_Ballos(void) SetQuake2(30); PlaySoundObject(44, 1); - if ( gMC.y > npc->y + 0x6000 && gMC.x < npc->x + 0x3000 && gMC.x > npc->x - 0x3000 ) + if (gMC.y > npc->y + 0x6000 && gMC.x < npc->x + 0x3000 && gMC.x > npc->x - 0x3000) DamageMyChar(16); for (i = 0; i < 0x10; ++i) diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index 86d03874..47b59ab5 100644 --- a/src/BossTwinD.cpp +++ b/src/BossTwinD.cpp @@ -490,7 +490,7 @@ void ActBossChar_Twin(void) } } - if ( npc->count1 > 0x3FF ) + if (npc->count1 > 0x3FF) npc->count1 -= 0x400; break; diff --git a/src/BossX.cpp b/src/BossX.cpp index 92c6e6cf..e17d5667 100644 --- a/src/BossX.cpp +++ b/src/BossX.cpp @@ -55,7 +55,7 @@ static void ActBossChar03_01(NPCHAR *npc) ++npc->ani_no; } - if ( npc->ani_no > 3 ) + if (npc->ani_no > 3) npc->ani_no = 2; npc->xm -= 0x20; @@ -100,7 +100,7 @@ static void ActBossChar03_01(NPCHAR *npc) ++npc->ani_no; } - if ( npc->ani_no > 5 ) + if (npc->ani_no > 5) npc->ani_no = 4; npc->xm += 0x20; From b0ebfd3aa38260bf1e947c6d73c23d21b2a5ad22 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 15:04:45 +0200 Subject: [PATCH 3/6] Fix RECT declaration indentation Signed-off-by: Gabriel Ravier --- src/BossAlmo1.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp index a9af1ffb..bdd88eb6 100644 --- a/src/BossAlmo1.cpp +++ b/src/BossAlmo1.cpp @@ -13,7 +13,8 @@ static void ActBossChar_Core_Face(NPCHAR *npc) { - RECT rect[4] = { + RECT rect[4] = + { {0, 0, 72, 112}, {0, 112, 72, 224}, {160, 0, 232, 112}, @@ -62,7 +63,8 @@ static void ActBossChar_Core_Face(NPCHAR *npc) static void ActBossChar_Core_Tail(NPCHAR *npc) { - RECT rect[3] = { + RECT rect[3] = + { {72, 0, 160, 112}, {72, 112, 160, 224}, {0, 0, 0, 0}, @@ -114,7 +116,8 @@ static void ActBossChar_Core_Mini(NPCHAR *npc) int ym; int xm; - RECT rect[3] = { + RECT rect[3] = + { {256, 0, 320, 40}, {256, 40, 320, 80}, {256, 80, 320, 120}, From 8c9aac9594b23080fa8647ea30dd05a02f3f6bfa Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 15:11:07 +0200 Subject: [PATCH 4/6] Fixed declaration formatting Signed-off-by: Gabriel Ravier --- src/BossAlmo2.cpp | 12 ++++++++---- src/BossBallos.cpp | 9 ++++++--- src/BossFrog.cpp | 6 ++++-- src/BossIronH.cpp | 6 ++++-- src/BossOhm.cpp | 9 ++++++--- src/BossPress.cpp | 6 ++++-- src/BossTwinD.cpp | 12 ++++++++---- src/BossX.cpp | 15 ++++++++++----- 8 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/BossAlmo2.cpp b/src/BossAlmo2.cpp index 67c1b020..cded7e21 100644 --- a/src/BossAlmo2.cpp +++ b/src/BossAlmo2.cpp @@ -14,7 +14,8 @@ static void ActBossCharA_Head(NPCHAR *npc) { - RECT rect[4] = { + RECT rect[4] = + { {0, 0, 72, 112}, {0, 112, 72, 224}, {160, 0, 232, 112}, @@ -61,7 +62,8 @@ static void ActBossCharA_Head(NPCHAR *npc) static void ActBossCharA_Tail(NPCHAR *npc) { - RECT rect[3] = { + RECT rect[3] = + { {72, 0, 160, 112}, {72, 112, 160, 224}, {0, 0, 0, 0}, @@ -107,7 +109,8 @@ static void ActBossCharA_Tail(NPCHAR *npc) static void ActBossCharA_Face(NPCHAR *npc) { - RECT rect[5] = { + RECT rect[5] = + { {0, 0, 0, 0}, {160, 112, 232, 152}, {160, 152, 232, 192}, @@ -174,7 +177,8 @@ static void ActBossCharA_Mini(NPCHAR *npc) { int deg; - RECT rect[3] = { + RECT rect[3] = + { {256, 0, 320, 40}, {256, 40, 320, 80}, {256, 80, 320, 120}, diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp index 93920519..c594ebe0 100644 --- a/src/BossBallos.cpp +++ b/src/BossBallos.cpp @@ -13,7 +13,8 @@ static void ActBossChar_Eye(NPCHAR *npc) { - RECT rcLeft[5] = { + RECT rcLeft[5] = + { {272, 0, 296, 16}, {272, 16, 296, 32}, {272, 32, 296, 48}, @@ -21,7 +22,8 @@ static void ActBossChar_Eye(NPCHAR *npc) {240, 16, 264, 32}, }; - RECT rcRight[5] = { + RECT rcRight[5] = + { {296, 0, 320, 16}, {296, 16, 320, 32}, {296, 32, 320, 48}, @@ -104,7 +106,8 @@ static void ActBossChar_Eye(NPCHAR *npc) static void ActBossChar_Body(NPCHAR *npc) { - RECT rc[4] = { + RECT rc[4] = + { {0, 0, 120, 120}, {120, 0, 240, 120}, {0, 120, 120, 240}, diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index bc665689..ca5b733b 100644 --- a/src/BossFrog.cpp +++ b/src/BossFrog.cpp @@ -91,7 +91,8 @@ void ActBossChar_Frog(void) int ym; int xm; - RECT rcLeft[9] = { + RECT rcLeft[9] = + { {0, 0, 0, 0}, {0, 48, 80, 112}, {0, 112, 80, 176}, @@ -103,7 +104,8 @@ void ActBossChar_Frog(void) {120, 0, 160, 24}, }; - RECT rcRight[9] = { + RECT rcRight[9] = + { {0, 0, 0, 0}, {80, 48, 160, 112}, {80, 112, 160, 176}, diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index c76ec3c0..580a6292 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -174,7 +174,8 @@ void ActBossChar_Ironhead(void) break; } - RECT rc[9] = { + RECT rc[9] = + { {0, 0, 64, 24}, {64, 0, 128, 24}, {128, 0, 192, 24}, @@ -186,7 +187,8 @@ void ActBossChar_Ironhead(void) {256, 48, 320, 72}, }; - RECT rcDamage[9] = { + RECT rcDamage[9] = + { {0, 24, 64, 48}, {64, 24, 128, 48}, {128, 24, 192, 48}, diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp index 2df6aedd..b14ffcd9 100644 --- a/src/BossOhm.cpp +++ b/src/BossOhm.cpp @@ -41,12 +41,14 @@ static void ActBoss01_34() { int i; - RECT rcLeft[2] = { + RECT rcLeft[2] = + { {0, 56, 40, 88}, {40, 56, 80, 88}, }; - RECT rcRight[2] = { + RECT rcRight[2] = + { {0, 88, 40, 120}, {40, 88, 80, 120}, }; @@ -454,7 +456,8 @@ void ActBossChar_Omega() break; } - RECT rect[4] = { + RECT rect[4] = + { {0, 0, 80, 56}, {80, 0, 160, 56}, {160, 0, 240, 56}, diff --git a/src/BossPress.cpp b/src/BossPress.cpp index 5412b46e..59fdcc0a 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -206,13 +206,15 @@ void ActBossChar_Press(void) gBoss[3].x = npc->x; gBoss[3].y = npc->y + 0x5000; - RECT rc[3] = { + RECT rc[3] = + { {0, 0, 80, 120}, {80, 0, 160, 120}, {160, 0, 240, 120}, }; - RECT rcDamage[3] = { + RECT rcDamage[3] = + { {0, 120, 80, 240}, {80, 120, 160, 240}, {160, 120, 240, 240}, diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index 47b59ab5..f4fb043d 100644 --- a/src/BossTwinD.cpp +++ b/src/BossTwinD.cpp @@ -14,13 +14,15 @@ static void ActBossCharT_DragonBody(NPCHAR *npc) { unsigned char deg; - RECT rcLeft[3] = { + RECT rcLeft[3] = + { {0, 0, 40, 40}, {40, 0, 80, 40}, {80, 0, 120, 40}, }; - RECT rcRight[3] = { + RECT rcRight[3] = + { {0, 40, 40, 80}, {40, 40, 80, 80}, {80, 40, 120, 80}, @@ -96,14 +98,16 @@ static void ActBossCharT_DragonHead(NPCHAR *npc) int ym; int xm; - RECT rcLeft[4] = { + RECT rcLeft[4] = + { {0, 80, 40, 112}, {40, 80, 80, 112}, {80, 80, 120, 112}, {120, 80, 160, 112}, }; - RECT rcRight[4] = { + RECT rcRight[4] = + { {0, 112, 40, 144}, {40, 112, 80, 144}, {80, 112, 120, 144}, diff --git a/src/BossX.cpp b/src/BossX.cpp index e17d5667..d4edb544 100644 --- a/src/BossX.cpp +++ b/src/BossX.cpp @@ -13,7 +13,8 @@ static void ActBossChar03_01(NPCHAR *npc) { - RECT rcUp[6] = { + RECT rcUp[6] = + { {0, 0, 72, 32}, {0, 32, 72, 64}, {72, 0, 144, 32}, @@ -22,7 +23,8 @@ static void ActBossChar03_01(NPCHAR *npc) {144, 32, 216, 64}, }; - RECT rcDown[6] = { + RECT rcDown[6] = + { {0, 64, 72, 96}, {0, 96, 72, 128}, {72, 64, 144, 96}, @@ -214,7 +216,8 @@ static void ActBossChar03_02(NPCHAR *npc) { int direct; - RECT rect[4] = { + RECT rect[4] = + { {0, 128, 72, 160}, {72, 128, 144, 160}, {0, 160, 72, 192}, @@ -366,7 +369,8 @@ static void ActBossChar03_04(NPCHAR *npc) int ym; int xm; - RECT rect[8] = { + RECT rect[8] = + { {0, 192, 16, 208}, {16, 192, 32, 208}, {32, 192, 48, 208}, @@ -440,7 +444,8 @@ static void ActBossChar03_face(NPCHAR *npc) { static unsigned char flash; - RECT rect[3] = { + RECT rect[3] = + { {216, 0, 320, 48}, {216, 48, 320, 96}, {216, 144, 320, 192}, From 1b0ebfe25d338ff6f9e05d4c3162f3a4b65a25c4 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 18:10:54 +0200 Subject: [PATCH 5/6] Revert RECT formatting changes Signed-off-by: Gabriel Ravier --- src/BossAlmo1.cpp | 6 ++---- src/BossAlmo2.cpp | 12 ++++-------- src/BossBallos.cpp | 9 +++------ src/BossFrog.cpp | 6 ++---- src/BossIronH.cpp | 6 ++---- src/BossOhm.cpp | 9 +++------ src/BossPress.cpp | 6 ++---- src/BossTwinD.cpp | 12 ++++-------- src/BossX.cpp | 15 +++++---------- 9 files changed, 27 insertions(+), 54 deletions(-) diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp index bdd88eb6..3de864be 100644 --- a/src/BossAlmo1.cpp +++ b/src/BossAlmo1.cpp @@ -13,8 +13,7 @@ static void ActBossChar_Core_Face(NPCHAR *npc) { - RECT rect[4] = - { + RECT rect[4] = { {0, 0, 72, 112}, {0, 112, 72, 224}, {160, 0, 232, 112}, @@ -63,8 +62,7 @@ static void ActBossChar_Core_Face(NPCHAR *npc) static void ActBossChar_Core_Tail(NPCHAR *npc) { - RECT rect[3] = - { + RECT rect[3] = { {72, 0, 160, 112}, {72, 112, 160, 224}, {0, 0, 0, 0}, diff --git a/src/BossAlmo2.cpp b/src/BossAlmo2.cpp index cded7e21..67c1b020 100644 --- a/src/BossAlmo2.cpp +++ b/src/BossAlmo2.cpp @@ -14,8 +14,7 @@ static void ActBossCharA_Head(NPCHAR *npc) { - RECT rect[4] = - { + RECT rect[4] = { {0, 0, 72, 112}, {0, 112, 72, 224}, {160, 0, 232, 112}, @@ -62,8 +61,7 @@ static void ActBossCharA_Head(NPCHAR *npc) static void ActBossCharA_Tail(NPCHAR *npc) { - RECT rect[3] = - { + RECT rect[3] = { {72, 0, 160, 112}, {72, 112, 160, 224}, {0, 0, 0, 0}, @@ -109,8 +107,7 @@ static void ActBossCharA_Tail(NPCHAR *npc) static void ActBossCharA_Face(NPCHAR *npc) { - RECT rect[5] = - { + RECT rect[5] = { {0, 0, 0, 0}, {160, 112, 232, 152}, {160, 152, 232, 192}, @@ -177,8 +174,7 @@ static void ActBossCharA_Mini(NPCHAR *npc) { int deg; - RECT rect[3] = - { + RECT rect[3] = { {256, 0, 320, 40}, {256, 40, 320, 80}, {256, 80, 320, 120}, diff --git a/src/BossBallos.cpp b/src/BossBallos.cpp index c594ebe0..93920519 100644 --- a/src/BossBallos.cpp +++ b/src/BossBallos.cpp @@ -13,8 +13,7 @@ static void ActBossChar_Eye(NPCHAR *npc) { - RECT rcLeft[5] = - { + RECT rcLeft[5] = { {272, 0, 296, 16}, {272, 16, 296, 32}, {272, 32, 296, 48}, @@ -22,8 +21,7 @@ static void ActBossChar_Eye(NPCHAR *npc) {240, 16, 264, 32}, }; - RECT rcRight[5] = - { + RECT rcRight[5] = { {296, 0, 320, 16}, {296, 16, 320, 32}, {296, 32, 320, 48}, @@ -106,8 +104,7 @@ static void ActBossChar_Eye(NPCHAR *npc) static void ActBossChar_Body(NPCHAR *npc) { - RECT rc[4] = - { + RECT rc[4] = { {0, 0, 120, 120}, {120, 0, 240, 120}, {0, 120, 120, 240}, diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index ca5b733b..bc665689 100644 --- a/src/BossFrog.cpp +++ b/src/BossFrog.cpp @@ -91,8 +91,7 @@ void ActBossChar_Frog(void) int ym; int xm; - RECT rcLeft[9] = - { + RECT rcLeft[9] = { {0, 0, 0, 0}, {0, 48, 80, 112}, {0, 112, 80, 176}, @@ -104,8 +103,7 @@ void ActBossChar_Frog(void) {120, 0, 160, 24}, }; - RECT rcRight[9] = - { + RECT rcRight[9] = { {0, 0, 0, 0}, {80, 48, 160, 112}, {80, 112, 160, 176}, diff --git a/src/BossIronH.cpp b/src/BossIronH.cpp index 580a6292..c76ec3c0 100644 --- a/src/BossIronH.cpp +++ b/src/BossIronH.cpp @@ -174,8 +174,7 @@ void ActBossChar_Ironhead(void) break; } - RECT rc[9] = - { + RECT rc[9] = { {0, 0, 64, 24}, {64, 0, 128, 24}, {128, 0, 192, 24}, @@ -187,8 +186,7 @@ void ActBossChar_Ironhead(void) {256, 48, 320, 72}, }; - RECT rcDamage[9] = - { + RECT rcDamage[9] = { {0, 24, 64, 48}, {64, 24, 128, 48}, {128, 24, 192, 48}, diff --git a/src/BossOhm.cpp b/src/BossOhm.cpp index b14ffcd9..2df6aedd 100644 --- a/src/BossOhm.cpp +++ b/src/BossOhm.cpp @@ -41,14 +41,12 @@ static void ActBoss01_34() { int i; - RECT rcLeft[2] = - { + RECT rcLeft[2] = { {0, 56, 40, 88}, {40, 56, 80, 88}, }; - RECT rcRight[2] = - { + RECT rcRight[2] = { {0, 88, 40, 120}, {40, 88, 80, 120}, }; @@ -456,8 +454,7 @@ void ActBossChar_Omega() break; } - RECT rect[4] = - { + RECT rect[4] = { {0, 0, 80, 56}, {80, 0, 160, 56}, {160, 0, 240, 56}, diff --git a/src/BossPress.cpp b/src/BossPress.cpp index 59fdcc0a..5412b46e 100644 --- a/src/BossPress.cpp +++ b/src/BossPress.cpp @@ -206,15 +206,13 @@ void ActBossChar_Press(void) gBoss[3].x = npc->x; gBoss[3].y = npc->y + 0x5000; - RECT rc[3] = - { + RECT rc[3] = { {0, 0, 80, 120}, {80, 0, 160, 120}, {160, 0, 240, 120}, }; - RECT rcDamage[3] = - { + RECT rcDamage[3] = { {0, 120, 80, 240}, {80, 120, 160, 240}, {160, 120, 240, 240}, diff --git a/src/BossTwinD.cpp b/src/BossTwinD.cpp index f4fb043d..47b59ab5 100644 --- a/src/BossTwinD.cpp +++ b/src/BossTwinD.cpp @@ -14,15 +14,13 @@ static void ActBossCharT_DragonBody(NPCHAR *npc) { unsigned char deg; - RECT rcLeft[3] = - { + RECT rcLeft[3] = { {0, 0, 40, 40}, {40, 0, 80, 40}, {80, 0, 120, 40}, }; - RECT rcRight[3] = - { + RECT rcRight[3] = { {0, 40, 40, 80}, {40, 40, 80, 80}, {80, 40, 120, 80}, @@ -98,16 +96,14 @@ static void ActBossCharT_DragonHead(NPCHAR *npc) int ym; int xm; - RECT rcLeft[4] = - { + RECT rcLeft[4] = { {0, 80, 40, 112}, {40, 80, 80, 112}, {80, 80, 120, 112}, {120, 80, 160, 112}, }; - RECT rcRight[4] = - { + RECT rcRight[4] = { {0, 112, 40, 144}, {40, 112, 80, 144}, {80, 112, 120, 144}, diff --git a/src/BossX.cpp b/src/BossX.cpp index d4edb544..e17d5667 100644 --- a/src/BossX.cpp +++ b/src/BossX.cpp @@ -13,8 +13,7 @@ static void ActBossChar03_01(NPCHAR *npc) { - RECT rcUp[6] = - { + RECT rcUp[6] = { {0, 0, 72, 32}, {0, 32, 72, 64}, {72, 0, 144, 32}, @@ -23,8 +22,7 @@ static void ActBossChar03_01(NPCHAR *npc) {144, 32, 216, 64}, }; - RECT rcDown[6] = - { + RECT rcDown[6] = { {0, 64, 72, 96}, {0, 96, 72, 128}, {72, 64, 144, 96}, @@ -216,8 +214,7 @@ static void ActBossChar03_02(NPCHAR *npc) { int direct; - RECT rect[4] = - { + RECT rect[4] = { {0, 128, 72, 160}, {72, 128, 144, 160}, {0, 160, 72, 192}, @@ -369,8 +366,7 @@ static void ActBossChar03_04(NPCHAR *npc) int ym; int xm; - RECT rect[8] = - { + RECT rect[8] = { {0, 192, 16, 208}, {16, 192, 32, 208}, {32, 192, 48, 208}, @@ -444,8 +440,7 @@ static void ActBossChar03_face(NPCHAR *npc) { static unsigned char flash; - RECT rect[3] = - { + RECT rect[3] = { {216, 0, 320, 48}, {216, 48, 320, 96}, {216, 144, 320, 192}, From edba2f176ce2227643ff60aee04d936b041f3dd3 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 19:07:01 +0200 Subject: [PATCH 6/6] Correct RECT formatting error I missed Signed-off-by: Gabriel Ravier --- src/BossAlmo1.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/BossAlmo1.cpp b/src/BossAlmo1.cpp index 3de864be..a9af1ffb 100644 --- a/src/BossAlmo1.cpp +++ b/src/BossAlmo1.cpp @@ -114,8 +114,7 @@ static void ActBossChar_Core_Mini(NPCHAR *npc) int ym; int xm; - RECT rect[3] = - { + RECT rect[3] = { {256, 0, 320, 40}, {256, 40, 320, 80}, {256, 80, 320, 120},