From 9e5e2a0e26d36c13deb87901cca97738ded0ae98 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Sun, 15 Sep 2019 16:05:24 +0200 Subject: [PATCH] Indented some comments Signed-off-by: Gabriel Ravier --- src/BossFrog.cpp | 18 +++++++++--------- src/CommonDefines.h | 8 ++++---- src/NpChar.h | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/BossFrog.cpp b/src/BossFrog.cpp index 0af8eb9d..35811729 100644 --- a/src/BossFrog.cpp +++ b/src/BossFrog.cpp @@ -139,15 +139,15 @@ void ActBossChar_Frog(void) // Rects 1-4 are for when Balfrog is a frog, 5-8 for when he reverts into Balrog and goes into the ceiling RECT rcLeft[9] = { - {0, 0, 0, 0}, // Nothing - {0, 48, 80, 112}, // Balfrog standing still - {0, 112, 80, 176}, // Balfrog with his mouth barely open, crouching - {0, 176, 80, 240}, // Balfrog with his mouth open, crouching - {160, 48, 240, 112}, // Balfrog with his mouth open, crouching, flashing - {160, 112, 240, 200}, // Balfrog jumping - {200, 0, 240, 24}, // Balrog completely white - {80, 0, 120, 24}, // Balrog crouching - {120, 0, 160, 24}, // Balrog jumping + {0, 0, 0, 0}, // Nothing + {0, 48, 80, 112}, // Balfrog standing still + {0, 112, 80, 176}, // Balfrog with his mouth barely open, crouching + {0, 176, 80, 240}, // Balfrog with his mouth open, crouching + {160, 48, 240, 112}, // Balfrog with his mouth open, crouching, flashing + {160, 112, 240, 200}, // Balfrog jumping + {200, 0, 240, 24}, // Balrog completely white + {80, 0, 120, 24}, // Balrog crouching + {120, 0, 160, 24}, // Balrog jumping }; // See above diff --git a/src/CommonDefines.h b/src/CommonDefines.h index d0e72807..71393f06 100644 --- a/src/CommonDefines.h +++ b/src/CommonDefines.h @@ -15,10 +15,10 @@ enum Collisions { - COLL_LEFT_WALL = 1, // Touching a left wall - COLL_CEILING = 2, // Touching a ceiling - COLL_RIGHT_WALL = 4, // Touching a right wall - COLL_GROUND = 8, // Touching the ground + COLL_LEFT_WALL = 1, // Touching a left wall + COLL_CEILING = 2, // Touching a ceiling + COLL_RIGHT_WALL = 4, // Touching a right wall + COLL_GROUND = 8, // Touching the ground // To be continued }; diff --git a/src/NpChar.h b/src/NpChar.h index 3c141d11..aa88bddd 100644 --- a/src/NpChar.h +++ b/src/NpChar.h @@ -25,6 +25,12 @@ else \ npc->rect = rcRight[npc->ani_no] +enum NPCCond +{ + NPCCOND_DAMAGE_BOSS = 0x10, // (gBoss npc exclusive) When set, damage the main boss + NPCCOND_ALIVE = 0x80 // Whether the NPC is alive or not +}; + // Be careful when changing these: they're baked into the 'npc.tbl' file enum NPCFlags { @@ -45,12 +51,6 @@ enum NPCFlags NPC_SHOW_DAMAGE = 1<<15 // Show the number of damage taken when harmed }; -enum NPCCond -{ - NPCCOND_DAMAGE_BOSS = 0x10, // (gBoss npc exclusive) When set, damage the main boss - NPCCOND_ALIVE = 0x80 // Whether the NPC is alive or not -}; - enum NPCNames { NPC_NULL = 0,