From 1b0ebfe25d338ff6f9e05d4c3162f3a4b65a25c4 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 18:10:54 +0200 Subject: [PATCH] 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},