From c7c40fa24a16685e87da1a278a0f44a5899ffa4f Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Tue, 7 May 2019 14:31:06 +0200 Subject: [PATCH] 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;